improved test script environment

.gitlab-ci.yml

@@ -4,6 +4,7 @@ before_script:
   - export COMPOSE_PROJECT_NAME=buildref${CI_BUILD_REF}${CI_BUILD_REF_NAME_NORMALIZED}
   - mv tests/docker-compose.ci.override.yml tests/docker-compose.override.yml
   - cd tests
+  - sh ./env.sh
 
 build:
   stage: build

tests/bash.sh

@@ -2,6 +2,6 @@
 
 set -e
 
-. "env.sh"
+. ./env.sh
 
 ${DOCKER_COMPOSE} run --rm php bash

tests/env.sh

@@ -5,7 +5,7 @@ echo "Setting ENV variables..."
 export GIIANT_TEST_DB=${GIIANT_TEST_DB-sakila}
 export CI_APP_VOLUME=${CI_APP_VOLUME-..}
 export COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME-giiant}
-DOCKER_COMPOSE="docker-compose --x-networking"
+export DOCKER_COMPOSE="docker-compose --x-networking"
 
 # replace the stack name in the yml configuration for isolated CI stacks
 sed -i.bak s/giiant_/${COMPOSE_PROJECT_NAME}_/ acceptance.suite.yml

tests/init.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-. "env.sh"
+. ./env.sh
 
 ${DOCKER_COMPOSE} kill
 ${DOCKER_COMPOSE} rm -fv

tests/run.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-. "env.sh"
+. ./env.sh
 
 # replace the stack name in the yml configuration for isolated CI stacks
 sed -i.bak s/giiant_/${COMPOSE_PROJECT_NAME}_/ acceptance.suite.yml