From a065dfbe1ec7c7351e03babbc122e8340db3f5ea Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 7 Jun 2021 01:31:21 +0200
Subject: [PATCH] WIP: pipeline
---
.gitlab-ci.yml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6726850..de776d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,18 +22,19 @@
variables:
# this is the image where cpplib repo is present (artifact from pipeline in
# caosdb-cpplib)
- CI_REGISTRY_IMAGE_CPPLIB: $CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv:$CPP
+ CPPLIB_TESTENV_IMAGE_TAG: $CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv:$CI_COMMIT_REF_NAME
+ CI_REGISTRY_IMAGE_CPPLIB: $CPPLIB_TESTENV_IMAGE_TAG
# 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
CPPINTTEST_TESTENV_IMAGE_SUFFIX: $CI_COMMIT_REF_NAME
CPPINTTEST_REPO_PATH: caosdb/src/caosdb-cppinttest
- CPPINTTEST_TESTENV_IMAGE_TAG: ${CPPINTTEST_REPO_PATH}/testenv:${CPPINTTEST_IMAGE_SUFFIX}
+ CPPINTTEST_TESTENV_IMAGE_TAG: $CPPINTTEST_REPO_PATH/testenv:$CPPINTTEST_IMAGE_SUFFIX
# this is the image where the cpplib is installed and where the testsuite runs
- CPPINTTEST_REGISTRY_IMAGE: ${CI_REGISTRY}/${CPPINTTEST_TESTENV_IMAGE_TAG}
+ CPPINTTEST_REGISTRY_IMAGE: $CI_REGISTRY/$CPPINTTEST_TESTENV_IMAGE_TAG
# this is the name of the image in the /image-cache/ directory
- CPPINTTEST_IMAGE_CACHE: ${CPPINTTEST_TESTENV_IMAGE_TAG}.tar
+ CPPINTTEST_IMAGE_CACHE: $CPPINTTEST_TESTENV_IMAGE_TAG.tar
## FOR DEBUGGING
--
GitLab