dbhost postgres

Author: univietw

Diff for: .gitlab-ci.yml

@@ -21,7 +21,11 @@ before_script:
   # Wait until database is ready
   - timeout 5m bash -c 'echo -e "DB...\c"; until </dev/tcp/127.0.0.1/5432; do echo -e ".\c"; sleep 1; done; echo "ok";' 2> /dev/null
   - cd ../..
+<<<<<<< HEAD
   - moodle-plugin-ci install --moodle="moodle-upstream-core" --db-user=moodleci --db-pass=moodleing --db-host=127.0.0.1
+=======
+  - moodle-plugin-ci install --moodle="moodle-upstream-core" --db-user=root --db-pass=superrootpass --db-host=postgres
+>>>>>>> dbhost postgres
 
 .job_template: &job_definition
   script: