From d50028a6fe2440db2ca1103331e596e2f9b14268 Mon Sep 17 00:00:00 2001
From: Daniel Hornung <d.hornung@indiscale.com>
Date: Mon, 20 Jun 2022 12:39:29 +0200
Subject: [PATCH] MAINT: Switching CI pipeline triggering to the "trigger"
keyword.
---
.gitlab-ci.yml | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6817020f..e0b69781 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,10 +3,10 @@
#
# Copyright (C) 2018 Research Group Biomedical Physics,
# Max-Planck-Institute for Dynamics and Self-Organization Göttingen
+# Copyright (C) 2020-2022 IndiScale GmbH (info@indiscale.com)
# Copyright (C) 2019 Henrik tom Wörden
# Copyright (C) 2020 Timm Fitschen (t.fitschen@indiscale.com)
-# Copyright (C) 2020 IndiScale GmbH (info@indiscale.com)
-# Copyright (C) 2020 Daniel Hornung <d.hornung@indiscale.com>
+# Copyright (C) 2020-2022 Daniel Hornung <d.hornung@indiscale.com>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -66,18 +66,23 @@ test-server-side-scripting:
- make test-sss
# Trigger building of server image and integration tests
-trigger_build:
- timeout: 15 minutes
- tags: [ docker ]
+trigger_inttest:
stage: deploy
- script:
- - /usr/bin/curl -X POST
- -F token=$CI_JOB_TOKEN
- -F "variables[F_BRANCH]=$CI_COMMIT_REF_NAME"
- -F "variables[WEBUI]=$CI_COMMIT_REF_NAME"
- -F "variables[TriggerdBy]=WEBUI"
- -F "variables[TriggerdByHash]=$CI_COMMIT_SHORT_SHA"
- -F ref=$DEPLOY_REF https://gitlab.indiscale.com/api/v4/projects/14/trigger/pipeline
+ inherit:
+ variables:
+ # List the variables that shall be inherited, which also means they will override any equally
+ # named varibles in child pipelines.
+ - DEPLOY_REF
+ variables:
+ # Renaming variables.
+ F_BRANCH: $CI_COMMIT_REF_NAME
+ WEBUI: $CI_COMMIT_REF_NAME
+ TriggeredBy: WEBUI
+ TriggeredByHash: $CI_COMMIT_SHORT_SHA
+ trigger:
+ project: caosdb/src/caosdb-deploy
+ branch: $DEPLOY_REF
+ strategy: depend
# Build a docker image in which tests for this repository can run
build-testenv:
--
GitLab