WIP: pipeline

.gitlab-ci.yml

@@ -22,11 +22,12 @@
 # ** end header
 #
 
+# TODO set DEPLOY_REF to dev after merge of f-feature-branch-pipeline
 variables:
-  CI_REVISION: f-versioning
-  CI_DEPLOY_BRANCH: f-versioning
+  DEPLOY_REF: f-feature-branch-pipeline
   CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/caosdb-server/caosdb-server-testenv:latest
 
+image: $CI_REGISTRY_IMAGE
 stages:
   - setup
   - test
@@ -53,7 +54,6 @@ build-testenv:
 # Test: run unit tests of the server
 test:
   tags: [ docker ]
-  image: $CI_REGISTRY_IMAGE
   stage: test
   script:
     - mvn -v
@@ -67,13 +67,11 @@ test:
 # Deploy: Trigger building of server image and integration tests
 trigger_build:
   tags: [ docker ]
-  image: $CI_REGISTRY_IMAGE
   stage: deploy
   script:
     - /usr/bin/curl -X POST
       -F token=$DEPLOY_TRIGGER_TOKEN
-      -F "variables[CI_REVISION]=$CI_REVISION"
       -F "variables[SERVER]=$CI_COMMIT_REF_NAME"
       -F "variables[TriggerdBy]=SERVER"
       -F "variables[TriggerdByHash]=$CI_COMMIT_SHORT_SHA"
-      -F ref=$CI_DEPLOY_BRANCH https://gitlab.indiscale.com/api/v4/projects/14/trigger/pipeline
+      -F ref=$DEPLOY_REF https://gitlab.indiscale.com/api/v4/projects/14/trigger/pipeline