From 81182dbab059e37cdc7257fa23cbadd8645c100a Mon Sep 17 00:00:00 2001
From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date: Sat, 13 Mar 2021 14:07:02 +0000
Subject: [PATCH] Attempts to fix CI dependency failures (#15709)

* Attempts to fix CI dependency failures

* Lets try this

* And this

* And this
---
 .github/workflows/ci.yml         | 6 +++---
 tools/ci/dbconfig.txt            | 4 ++--
 tools/ci/generate_sql_scripts.py | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eff6c453acd..88eec1aece6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   run_linters:
     name: Run Linters
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: Setup Cache
@@ -37,7 +37,7 @@ jobs:
 
   compile_all_maps:
     name: Compile All Maps
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: Setup Cache
@@ -54,7 +54,7 @@ jobs:
 
   unit_tests_and_sql:
     name: Unit Tests + SQL Validation
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     services:
       mariadb:
         image: mariadb:latest
diff --git a/tools/ci/dbconfig.txt b/tools/ci/dbconfig.txt
index 2e5f85ee767..2fff6faf540 100644
--- a/tools/ci/dbconfig.txt
+++ b/tools/ci/dbconfig.txt
@@ -7,7 +7,7 @@ ADDRESS 127.0.0.1
 PORT 3306
 FEEDBACK_DATABASE feedback
 FEEDBACK_TABLEPREFIX
-FEEDBACK_LOGIN ci_sql
-FEEDBACK_PASSWORD not_a_strong_password
+FEEDBACK_LOGIN root
+FEEDBACK_PASSWORD root
 ASYNC_QUERY_TIMEOUT 10
 RUST_SQL_THREAD_LIMIT 50
diff --git a/tools/ci/generate_sql_scripts.py b/tools/ci/generate_sql_scripts.py
index 6091148909e..5c7cf97230b 100644
--- a/tools/ci/generate_sql_scripts.py
+++ b/tools/ci/generate_sql_scripts.py
@@ -45,7 +45,7 @@ scriptLines = [
     "#!/bin/bash\n",
     "set -euo pipefail\n"
     "python3 -m pip install setuptools\n" # Yes I know you can PIP multiple things but they need to happen in this order
-    "python3 -m pip install mysql-connector\n"
+    "python3 -m pip install mysql-connector-python\n"
     "mysql -u root -proot < tools/ci/sql_v0.sql\n"
 ]
 
@@ -79,7 +79,6 @@ scriptLines.append("mysql -u root -proot -e 'DROP DATABASE feedback;'\n")
 scriptLines.append("mysql -u root -proot < SQL/paradise_schema_prefixed.sql\n")
 scriptLines.append("mysql -u root -proot -e 'DROP DATABASE feedback;'\n")
 scriptLines.append("mysql -u root -proot < SQL/paradise_schema.sql\n")
-scriptLines.append("mysql -u root -proot -e 'GRANT ALL on feedback.* TO `ci_sql`@`127.0.0.1` IDENTIFIED BY \"not_a_strong_password\";'\n")
 
 outputScript = open("tools/ci/validate_sql.sh", "w+")
 outputScript.writelines(scriptLines)