From a71b8e24493fbe53e5b2acfcf41809f7aad63d07 Mon Sep 17 00:00:00 2001
From: Teake Nutma <t.a.nutma@rug.nl>
Date: Mon, 4 Jul 2022 12:21:24 +0200
Subject: [PATCH] Make job variables global
---
templates/release-mr.yml | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/templates/release-mr.yml b/templates/release-mr.yml
index b814229..4e091cb 100644
--- a/templates/release-mr.yml
+++ b/templates/release-mr.yml
@@ -1,12 +1,14 @@
include:
- local: '/templates/shared/all.yml'
+variables:
+ RELEASE_MR_SOURCE_BRANCH: $CI_DEFAULT_BRANCH
+ RELEASE_MR_TARGET_BRANCH: master
+
release_mr:
stage: pre
image: ${CI_AWE_IMAGE_BASE}/ci-tools:${CI_AWE_IMAGE_TAG}
variables:
- RELEASE_MR_SOURCE_BRANCH: $CI_DEFAULT_BRANCH
- RELEASE_MR_TARGET_BRANCH: master
GIT_DEPTH: 0
rules:
- if: $CI_AWE_SKIP_RELEASE_MR
@@ -14,16 +16,15 @@ release_mr:
- if: $CI_AWE_SKIP_ALL
when: never
- if: $CI_MERGE_REQUEST_ID
-# $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $RELEASE_MR_TARGET_BRANCH &&
-# $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $RELEASE_MR_SOURCE_BRANCH
-# - if: $CI_AWE_RUN_RELEASE_MR
-# - if: $CI_AWE_RUN_ALL
+ $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $RELEASE_MR_TARGET_BRANCH &&
+ $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $RELEASE_MR_SOURCE_BRANCH
+ - if: $CI_AWE_RUN_RELEASE_MR
+ - if: $CI_AWE_RUN_ALL
script:
- - env | sort
-# - python-gitlab-set-private-token ${RELEASE_MR_TOKEN}
-# - DESCRIPTION=$(git log-mr --output markdown --target ${RELEASE_MR_SOURCE_BRANCH} origin/${RELEASE_MR_TARGET_BRANCH}..origin/${RELEASE_MR_SOURCE_BRANCH})
-# - |
-# gitlab project-merge-request update \
-# --project-id ${CI_PROJECT_ID} \
-# --mr-iid ${CI_MERGE_REQUEST_IID} \
-# --description ${DESCRIPTION}
+ - python-gitlab-set-private-token ${RELEASE_MR_TOKEN}
+ - DESCRIPTION=$(git log-mr --output markdown --target ${RELEASE_MR_SOURCE_BRANCH} origin/${RELEASE_MR_TARGET_BRANCH}..origin/${RELEASE_MR_SOURCE_BRANCH})
+ - |
+ gitlab project-merge-request update \
+ --project-id ${CI_PROJECT_ID} \
+ --mr-iid ${CI_MERGE_REQUEST_IID} \
+ --description ${DESCRIPTION}
--
GitLab