From aa34ce3d4064c0f60a30be4cafe4a8205231801f Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Wed, 4 May 2022 13:03:02 +0200
Subject: [PATCH] remove RELEASE_NAME variable because of
https://gitlab.com/gitlab-org/gitlab/-/issues/293674
---
.gitlab-ci.yml | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5b742623..04d3c5dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ include:
stage: install-helm-chart
script:
- cd ${CHART_DIR:-"."}
- - ./fully-delete-helmrelease.sh "$RELEASE_NAME"
+ - ./fully-delete-helmrelease.sh "nc$CI_MERGE_REQUEST_IID"
extends:
- .use_kubernetes
- .chart_changes_rules
@@ -39,7 +39,6 @@ stages:
variables:
CHART_NAME: nextcloud-onlyoffice
- RELEASE_NAME: "nc$CI_MERGE_REQUEST_IID"
pre-install-delete-helmrelease:
extends:
@@ -55,7 +54,7 @@ post-install-delete-helmrelease:
# Gets triggered by on_stop of install-helmrelease, or manually
when: manual
environment:
- name: helmrelease/$RELEASE_NAME
+ name: helmrelease/nc$CI_MERGE_REQUEST_IID
action: stop
install-helmrelease:
@@ -71,14 +70,14 @@ install-helmrelease:
- cp values-local.yaml.example values-ci.yaml
# This sets the domains to files-MR_ID.gitlab.stackspin.net and
# office-MR_ID.gitlab.stackspin.net
- - sed -i "s/\.your\.domain/-$RELEASE_NAME.gitlab.stackspin.net/" values-ci.yaml
+ - sed -i "s/\.your\.domain/-nc$CI_MERGE_REQUEST_IID.gitlab.stackspin.net/" values-ci.yaml
# Make sure TLS certificate secrets for different MRs do not clash
- - sed -i "s/files-cert/files-cert-$RELEASE_NAME/" values-ci.yaml
- - sed -i "s/office-cert/office-cert-$RELEASE_NAME/" values-ci.yaml
- - helm install --wait "$RELEASE_NAME" . -f values-ci.yaml
+ - sed -i "s/files-cert/files-cert-nc$CI_MERGE_REQUEST_IID/" values-ci.yaml
+ - sed -i "s/office-cert/office-cert-nc$CI_MERGE_REQUEST_IID/" values-ci.yaml
+ - helm install --wait "nc$CI_MERGE_REQUEST_IID" . -f values-ci.yaml
environment:
- name: helmrelease/$RELEASE_NAME
- url: https://files-$RELEASE_NAME.gitlab.stackspin.net
+ name: helmrelease/nc$CI_MERGE_REQUEST_IID
+ url: https://files-nc$CI_MERGE_REQUEST_IID.gitlab.stackspin.net
auto_stop_in: 1 week
on_stop: post-install-delete-helmrelease
extends:
@@ -89,7 +88,7 @@ test-helm-chart:
stage: test-helm-chart
script:
- cd ${CHART_DIR:-"."}
- - helm test --logs "$RELEASE_NAME"
+ - helm test --logs "nc$CI_MERGE_REQUEST_IID"
extends:
- .use_kubernetes
- .chart_changes_rules
--
GitLab