From 22c0f13b3c7da6512995e1956416e0aaae4af19e Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 7 Jun 2021 02:59:39 +0200
Subject: [PATCH] WIP: pipeline
---
.gitlab-ci.yml | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0834da9..2b80999 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ variables:
CPPLIB_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv:$CI_COMMIT_REF_NAME
CPPINTTEST_PIPELINE: https://gitlab.indiscale.com/api/v4/projects/111/trigger/pipeline
- CPPINTTEST_BRANCHES: https://gitlab.indiscale.com/api/v4/projects/111/branches
+ CPPINTTEST_BRANCHES: https://gitlab.indiscale.com/api/v4/projects/111/repository/branches
GIT_SUBMODULE_STRATEGY: normal
## FOR DEBUGGING
@@ -95,13 +95,9 @@ trigger_inttest:
script:
## Determine the cppinttest branch...
- - command -v wget
# ... use an f-branch if posible...
- if echo "$CI_COMMIT_REF_NAME" | grep -c "^f-" ; then
- echo "Check if caosdb_cppinttest has branch $CI_COMMIT_REF_NAME" ;
- if wget ${CPPINTTEST_BRANCHES}/${CI_COMMIT_REF_NAME} ; then
- CPPINT_REF=$CI_COMMIT_REF_NAME ;
- fi;
+ CPPINT_REF=$CI_COMMIT_REF_NAME ;
fi;
# ... or use main if possible...
- if [[ "$CI_COMMIT_REF_NAME" == "main" ]] ; then
--
GitLab