diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6fe0f063d495b53eec52d153e1ef266fd41b3333..1521a66119bf02b8e9c76fbd66f41095072cf4b6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ variables: # this is the image where cpplib repo is present (artifact from pipeline in # caosdb-cpplib) - CPPLIB_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv:$CI_COMMIT_REF_NAME + CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv:$CI_COMMIT_REF_NAME # this is the image where all the docker containers (server, mysql and test # suite) are started CI_REGISTRY_IMAGE_BASE: $CI_REGISTRY/caosdb/src/caosdb-pyinttest/base:latest @@ -61,7 +61,7 @@ info: needs: [] script: - echo "Pipeline triggered by $TRIGGERED_BY_REPO@$TRIGGERED_BY_REF ($TRIGGERED_BY_HASH)" - - echo "$CPPLIB_REGISTRY_IMAGE" + - echo "$CI_REGISTRY_IMAGE" - echo "$CI_REGISTRY_IMAGE_BASE" - echo "$CPPINTTEST_REGISTRY_IMAGE" - echo "$CPPINTTEST_IMAGE_CACHE" @@ -92,9 +92,9 @@ build-testenv: - CPPINT_REF=${CPPINT_REF:-dev} #build testenv image - - docker pull $CPPLIB_REGISTRY_IMAGE || true # remove??? docker build --pull??? + - docker pull $CI_REGISTRY_IMAGE || true # remove??? docker build --pull??? - docker build - --build-arg CI_REGISTRY_IMAGE=$CPPLIB_REGISTRY_IMAGE + --build-arg CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE --file .docker/Dockerfile --pull --cache-from $CPPINTTEST_REGISTRY_IMAGE