From c86eec5a5a9a71be6713c667b94be6daf5be87cf Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 5 Aug 2022 11:23:06 +0200
Subject: [PATCH] PIPELINE: cherry pick .gitlab-ci.yml from dev
---
.gitlab-ci.yml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2bfe0e7..442a7ed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,12 +36,10 @@ variables:
TRIGGERED_BY_HASH: $CI_COMMIT_SHORT_SHA
# This is the caosdb-deploy branch which build the images for caosdb-server and caosdb-mysql
- # TODO change to dev after merge of f-grpc to dev
DEPLOY_REF: dev
DEFAULT_CAOSDB_TAG: dev
# The defalt branch to use with caosdb-cpplib
- # TODO: Change back to dev once f-consolidate-c has been merged
CPP_DEFAULT_BRANCH: dev
stages:
@@ -165,9 +163,9 @@ test:
- echo "CAOSDB_TAG = $CAOSDB_TAG"
- echo "DEPLOY_REF = $DEPLOY_REF"
- docker load < /image-cache/caosdb-${F_BRANCH}.tar || true
- - docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=${DEFAULT_CAOSDB_TAG}_F_dev ;
+ - docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=${DEFAULT_CAOSDB_TAG} ;
- echo "CAOSDB_TAG = $CAOSDB_TAG"
-
+
- docker load < /image-cache/${JULIAINTTEST_IMAGE_CACHE} || true
- docker pull $JULIAINTTEST_REGISTRY_IMAGE
--
GitLab