From 7df8b6167c6b5c818fa23339cc23f3426a63d441 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 7 Jun 2021 01:51:56 +0200
Subject: [PATCH] WIP: pipeline
---
.gitlab-ci.yml | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2a0dd5b..52f18b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,19 +22,17 @@
variables:
# this is the image where cpplib repo is present (artifact from pipeline in
# caosdb-cpplib)
- CI_CPPLIB_TESTENV_IMAGE_TAG: $CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv:$CI_COMMIT_REF_NAME
- CI_REGISTRY_IMAGE_CPPLIB: $CI_CPPLIB_TESTENV_IMAGE_TAG
+ 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
# 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
# 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/caosdb/src/caosdb-cppinttest/testenv:$CI_COMMIT_REF_NAME
# this is the name of the image in the /image-cache/ directory
- CPPINTTEST_IMAGE_CACHE: $CPPINTTEST_TESTENV_IMAGE_TAG.tar
+ CPPINTTEST_IMAGE_CACHE: caosdb/src/caosdb-cppinttest/testenv:CI_COMMIT_REF_NAME.tar
+
## FOR DEBUGGING
@@ -64,12 +62,8 @@ info:
needs: []
script:
- echo "Pipeline triggered by $TRIGGERED_BY_REPO@$TRIGGERED_BY_REF ($TRIGGERED_BY_HASH)"
- - echo "$CPPLIB_TESTENV_IMAGE_TAG"
- - echo "$CI_REGISTRY_IMAGE_CPPLIB"
+ - echo "$CPPLIB_REGISTRY_IMAGE"
- echo "$CI_REGISTRY_IMAGE_BASE"
- - echo "$CPPINTTEST_TESTENV_IMAGE_SUFFIX"
- - echo "$CPPINTTEST_REPO_PATH"
- - echo "$CPPINTTEST_TESTENV_IMAGE_TAG"
- echo "$CPPINTTEST_REGISTRY_IMAGE"
- echo "$CPPINTTEST_IMAGE_CACHE"
@@ -99,9 +93,9 @@ build-testenv:
- CPPINT_REF=${CPPINT_REF:-dev}
#build testenv image
- - docker pull $CI_REGISTRY_IMAGE_CPPLIB || true # remove??? docker build --pull???
- - docker build
- --build-arg CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE_CPPLIB
+ - docker pull $CPPLIB_REGISTRY_IMAGE || true # remove??? docker build --pull???
+ - docker buil
+ --build-arg CI_REGISTRY_IMAGE=$CPPLIB_REGISTRY_IMAGE
--file .docker/Dockerfile
--pull
--cache-from $CPPINTTEST_REGISTRY_IMAGE
--
GitLab