WIP: pipeline

.gitlab-ci.yml

@@ -21,15 +21,11 @@
 #
 
 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_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv:$CI_COMMIT_REF_NAME
+  CPPLIB_IMAGE_CACHE: caosdb/src/caosdb-cpplib/testenv:$CI_COMMIT_REF_NAME
 
-  CPPINTTEST_REPO: https://gitlab.indiscale.com/api/v4/projects/111
-  CPPINTTEST_PIPELINE: $CPPINTTEST_REPO/trigger/pipeline
-  CPPINTTEST_BRANCHES: $CPPINTTEST_REPO/branches
+  CPPINTTEST_PIPELINE: https://gitlab.indiscale.com/api/v4/projects/111/trigger/pipeline
+  CPPINTTEST_BRANCHES: https://gitlab.indiscale.com/api/v4/projects/111/branches
   GIT_SUBMODULE_STRATEGY: normal
 
   ## FOR DEBUGGING
@@ -54,6 +50,11 @@ info:
   needs: []
   script:
     - echo "Pipeline triggered by $TRIGGERED_BY_REPO@$TRIGGERED_BY_REF ($TRIGGERED_BY_HASH)"
+    - echo "$CPPLIB_REGISTRY_IMAGE"
+    - echo "$CPPLIB_IMAGE_CACHE"
+    - echo "$CPPINTTEST_PIPELINE"
+    - echo "$CPPINTTEST_BRANCHES"
+    - echo "$GIT_SUBMODULE_STRATEGY"
 
 # Build a docker image in which tests for this repository can run
 build-testenv:
@@ -119,7 +120,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 "variables[CPPLIB_REGISTRY_IMAGE]=$CPPLIB_REGISTRY_IMAGE"
       -F ref=${CPPINT_REF} $CPPINTTEST_PIPELINE 2>HTTPCODE
 
     # fail if the request failed