Allow for a testing database for unit tests

Author: vmcj

.github/jobs/baseinstall.sh

@@ -6,6 +6,12 @@ export version="$1"
 db=${2:-install}
 phpversion="${3}"
 
+# If this script is called from unit-tests.sh, we use the test environment
+export APP_ENV="${3:-prod}"
+
+# In the test environment, we need to use a different database
+[ "$APP_ENV" = "prod" ] && DATABASE_NAME=domjudge || DATABASE_NAME=domjudge_test
+
 set -eux
 
 if [ -z "$phpversion" ]; then
@@ -56,13 +62,13 @@ cat > ~/.my.cnf <<EOF
 [client]
 host=sqlserver
 user=root
-password=root
+password=${MYSQL_ROOT_PASSWORD}
 EOF
 cat ~/.my.cnf
 
-mysql_root "CREATE DATABASE IF NOT EXISTS \`domjudge\` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"
+mysql_root "CREATE DATABASE IF NOT EXISTS \`$DATABASE_NAME\` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"
 mysql_root "CREATE USER IF NOT EXISTS \`domjudge\`@'%' IDENTIFIED BY 'domjudge';"
-mysql_root "GRANT SELECT, INSERT, UPDATE, DELETE ON \`domjudge\`.* TO 'domjudge'@'%';"
+mysql_root "GRANT SELECT, INSERT, UPDATE, DELETE ON \`$DATABASE_NAME\`.* TO 'domjudge'@'%';"
 mysql_root "FLUSH PRIVILEGES;"
 
 # Show some MySQL debugging
@@ -73,7 +79,7 @@ mysql_root "SELECT user,host FROM mysql.user"
 mysql_root "SET GLOBAL max_allowed_packet=1073741824"
 mysql_root "SHOW GLOBAL STATUS LIKE 'Connection_errors_%'"
 mysql_root "SHOW VARIABLES LIKE '%_timeout'"
-echo "unused:sqlserver:domjudge:domjudge:domjudge:3306" > /opt/domjudge/domserver/etc/dbpasswords.secret
+echo "unused:sqlserver:$DATABASE_NAME:domjudge:domjudge:3306" > /opt/domjudge/domserver/etc/dbpasswords.secret
 mysql_user "SELECT CURRENT_USER();"
 mysql_user "SELECT USER();"
 section_end
@@ -122,29 +128,33 @@ section_end
 
 if [ "${db}" = "install" ]; then
     section_start "Install the example data"
+    if [ "$version" = "unit" ]; then
+	    # Make sure admin has no team associated so we will not insert submissions during unit tests.
+	    mysql_root "UPDATE user SET teamid=null WHERE userid=1;" $DATABASE_NAME
+    fi
     /opt/domjudge/domserver/bin/dj_setup_database -uroot -proot install-examples | tee -a "$ARTIFACTS/mysql.txt"
     section_end
 fi
 
 section_start "Setup user"
 # We're using the admin user in all possible roles
-mysql_root "DELETE FROM userrole WHERE userid=1;" domjudge
+mysql_root "DELETE FROM userrole WHERE userid=1;" $DATABASE_NAME
 if [ "$version" = "team" ]; then
     # Add team to admin user
-    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 3);" domjudge
-    mysql_root "UPDATE user SET teamid = 1 WHERE userid = 1;" domjudge
+    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 3);" $DATABASE_NAME
+    mysql_root "UPDATE user SET teamid = 1 WHERE userid = 1;" $DATABASE_NAME
 elif [ "$version" = "jury" ]; then
     # Add jury to admin user
-    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 2);" domjudge
+    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 2);" $DATABASE_NAME
 elif [ "$version" = "balloon" ]; then
     # Add balloon to admin user
-    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 4);" domjudge
+    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 4);" $DATABASE_NAME
 elif [ "$version" = "admin" ]; then
     # Add admin to admin user
-    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 1);" domjudge
-elif [ "$version" = "all" ]; then
-    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 1);" domjudge
-    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 3);" domjudge
-    mysql_root "UPDATE user SET teamid = 1 WHERE userid = 1;" domjudge
+    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 1);" $DATABASE_NAME
+elif [ "$version" = "all" ] || [ "$version" = "unit" ]; then
+    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 1);" $DATABASE_NAME
+    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 3);" $DATABASE_NAME
+    mysql_root "UPDATE user SET teamid = 1 WHERE userid = 1;" $DATABASE_NAME
 fi
 section_end

gitlab/base.sh

@@ -10,14 +10,6 @@ export APP_ENV="${1:-prod}"
 
 lsb_release -a
 
-cat > ~/.my.cnf <<EOF
-[client]
-host=sqlserver
-user=root
-password=${MYSQL_ROOT_PASSWORD}
-EOF
-cat ~/.my.cnf
-
 # FIXME: This chicken-egg problem is annoying but let us bootstrap for now.
 echo "CREATE DATABASE IF NOT EXISTS \`${DATABASE_NAME}\` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;" | mysql
 echo "CREATE USER 'domjudge'@'%' IDENTIFIED BY 'domjudge';" | mysql