From 9db230366d55ffa7cb775de2dc89346c4e7add72 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Tue, 16 Nov 2021 17:07:20 +0100
Subject: [PATCH] Update pipeline and caosdb-webui
---
.gitlab-ci.yml | 18 ++++++++++++------
caosdb-webui | 2 +-
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ad5f130..3bd20563 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,12 +47,15 @@ info:
stage: info
needs: []
script:
+ - *env
- echo "Pipeline triggered by $TRIGGERED_BY_REPO@$TRIGGERED_BY_REF ($TRIGGERED_BY_HASH)"
+ - echo "Pipeline will trigger DEPLOY with branch $DEPLOY_REF"
+ - echo "F_BRANCH: $F_BRANCH"
# Setup: Build a docker image in which tests for this repository can run
build-testenv:
tags: [ cached-dind ]
- image: docker:19.03
+ image: docker:20.10
stage: setup
timeout: 3h
only:
@@ -78,11 +81,7 @@ test:
- mvn compile
- mvn test
-# Deploy: Trigger building of server image and integration tests
-trigger_build:
- tags: [ docker ]
- stage: deploy
- script:
+.env: &env
- F_BRANCH="${CI_COMMIT_REF_NAME}"
# TODO remove, this is grpc-special stuff
@@ -99,6 +98,13 @@ trigger_build:
F_BRANCH=`echo "${F_BRANCH:7}"`;
fi
+# Deploy: Trigger building of server image and integration tests
+trigger_build:
+ tags: [ docker ]
+ stage: deploy
+ script:
+ - *env
+
- echo "Triggering pipeline ${DEPLOY_PIPELINE}@${DEPLOY_REF} with F_BRANCH=${F_BRANCH}"
- /usr/bin/curl -X POST
-F token=$CI_JOB_TOKEN
diff --git a/caosdb-webui b/caosdb-webui
index 8e5799db..ed062d62 160000
--- a/caosdb-webui
+++ b/caosdb-webui
@@ -1 +1 @@
-Subproject commit 8e5799db53b853b06a51a3bd250daeb9c779eee5
+Subproject commit ed062d621ba1b8c7c05308fe8870d8dfee4c9b1f
--
GitLab