diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cf218ce3d..415c8fa85 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,8 @@ workflow: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' before_script: - - free -mh + - 'free -mh' + - 'apt-get update -q' # Cache downloaded dependencies and plugins between builds. # To keep cache across branches add 'key: "$CI_JOB_NAME"' @@ -24,8 +25,13 @@ cache: verify:jdk11: stage: build script: + - 'apt-get install -q -y --no-install-recommends mariadb-server' + - 'mysqld_safe &' + - 'sleep 3' + - 'mysql -u root < Server/db_exports/global.sql' + - 'mysql -u root < Server/db_exports/testuser.sql' - 'cd Server' - - 'mvn $MAVEN_CLI_OPTS verify -DskipTests' + - 'mvn $MAVEN_CLI_OPTS verify' except: variables: - $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH @@ -33,7 +39,7 @@ verify:jdk11: test:json: stage: test script: - - apt-get update -qq && apt-get install -qq -y --no-install-recommends jq + - 'apt-get install -q -y --no-install-recommends jq' - 'find . -name \*.json -type f -print0 | xargs -0 -n1 -P8 jq empty' except: variables: diff --git a/Server/db_exports/global.sql b/Server/db_exports/global.sql index 0b5e21b74..255acee9d 100644 --- a/Server/db_exports/global.sql +++ b/Server/db_exports/global.sql @@ -1,3 +1,7 @@ +CREATE DATABASE global; + +USE global; + -- phpMyAdmin SQL Dump -- version 5.0.2 -- https://www.phpmyadmin.net/ diff --git a/Server/db_exports/testuser.sql b/Server/db_exports/testuser.sql new file mode 100644 index 000000000..d9d752183 --- /dev/null +++ b/Server/db_exports/testuser.sql @@ -0,0 +1,2 @@ +CREATE USER IF NOT EXISTS 2009scapetest@localhost IDENTIFIED BY '2009scapetest'; +GRANT ALL PRIVILEGES ON global.* TO 2009scapetest@localhost; \ No newline at end of file diff --git a/Server/src/test/resources/test.conf b/Server/src/test/resources/test.conf index 15b5ddd9d..0fa196892 100644 --- a/Server/src/test/resources/test.conf +++ b/Server/src/test/resources/test.conf @@ -8,8 +8,8 @@ noauth_default_admin = true #NOTE: If we are not using auth, this determines whe [database] database_name = "global" -database_username = "root" -database_password = "" +database_username = "2009scapetest" +database_password = "2009scapetest" database_address = "127.0.0.1" database_port = "3306"