From a9aedd502fefeb0c8b224642a44446056a2c51b3 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 7 Jun 2021 01:31:27 +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 f8400b5..e20b516 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,9 +23,9 @@
variables:
CPPLIB_TESTENV_IMAGE_SUFFIX: $CI_COMMIT_REF_NAME
CPPLIB_REPO_PATH: caosdb/src/caosdb-cpplib
- CPPLIB_TESTENV_IMAGE_TAG: ${CPPLIB_REPO_PATH}/testenv:${CPPLIB_IMAGE_SUFFIX}
- CPPLIB_REGISTRY_IMAGE: ${CI_REGISTRY}/${CPPLIB_TESTENV_IMAGE_TAG}
- CPPLIB_IMAGE_CACHE: ${CPPLIB_TESTENV_IMAGE_TAG}.tar
+ CPPLIB_TESTENV_IMAGE_TAG: $CPPLIB_REPO_PATH/testenv:$CPPLIB_IMAGE_SUFFIX
+ CPPLIB_REGISTRY_IMAGE: $CI_REGISTRY/$CPPLIB_TESTENV_IMAGE_TAG
+ CPPLIB_IMAGE_CACHE: $CPPLIB_TESTENV_IMAGE_TAG.tar
CPPINTTEST_REPO: https://gitlab.indiscale.com/api/v4/projects/111
CPPINTTEST_PIPELINE: $CPPINTTEST_REPO/trigger/pipeline
@@ -33,7 +33,7 @@ variables:
GIT_SUBMODULE_STRATEGY: normal
## FOR DEBUGGING
- TRIGGERED_BY_REPO: CPPINTTEST
+ TRIGGERED_BY_REPO: CPPLIB
TRIGGERED_BY_REF: $CI_COMMIT_REF_NAME
TRIGGERED_BY_HASH: $CI_COMMIT_SHORT_SHA
@@ -119,6 +119,7 @@ trigger_inttest:
-F "variables[TRIGGERED_BY_REPO]=$TRIGGERED_BY_REPO"
-F "variables[TRIGGERED_BY_REF]=$TRIGGERED_BY_REF"
-F "variables[TRIGGERED_BY_HASH]=$TRIGGERED_BY_HASH"
+ -F "variables[CPPLIB_TESTENV_IMAGE_TAG]=$CPPLIB_TESTENV_IMAGE_TAG"
-F ref=${CPPINT_REF} $CPPINTTEST_PIPELINE 2>HTTPCODE
# fail if the request failed
--
GitLab