Skip to content
Snippets Groups Projects
Verified Commit 9e6db43e authored by Timm Fitschen's avatar Timm Fitschen
Browse files

PIPELINE

parent 95331344
No related branches found
No related tags found
1 merge request!25F octave logging
Pipeline #25424 passed
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
variables: variables:
# this is the image where cpplib repo is present (artifact from pipeline in # this is the image where cpplib repo is present (artifact from pipeline in
# caosdb-cpplib) # caosdb-cpplib)
CPPLIB_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv CPPLIB_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 # this is the image where all the docker containers (server, mysql and test
# suite) are started # suite) are started
CI_REGISTRY_IMAGE_BASE: $CI_REGISTRY/caosdb/src/caosdb-pyinttest/base:latest CI_REGISTRY_IMAGE_BASE: $CI_REGISTRY/caosdb/src/caosdb-pyinttest/base:latest
...@@ -82,10 +82,9 @@ build-testenv: &build-testenv ...@@ -82,10 +82,9 @@ build-testenv: &build-testenv
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
#build testenv image #build testenv image
- TESTENV_TAG=$F_BRANCH - docker pull $CPPLIB_REGISTRY_IMAGE || { CPPLIB_REGISTRY_IMAGE="$CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv:dev" ; docker pull $CPPLIB_REGISTRY_IMAGE ; }
- docker pull $CPPLIB_REGISTRY_IMAGE:$TESTENV_TAG || TESTENV_TAG=dev
- docker build - docker build
--build-arg CPPLIB_REGISTRY_IMAGE=$CPPLIB_REGISTRY_IMAGE:$TESTENV_TAG --build-arg CPPLIB_REGISTRY_IMAGE=$CPPLIB_REGISTRY_IMAGE
--file .docker/Dockerfile --file .docker/Dockerfile
--pull --pull
--cache-from $CPPINTTEST_REGISTRY_IMAGE --cache-from $CPPINTTEST_REGISTRY_IMAGE
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment