From faf2c333aab225f27e5f600a2fcba2dfe102786c Mon Sep 17 00:00:00 2001
From: andresanaya21 <alvaroandres.anayaamariles@telefonica.com>
Date: Mon, 27 May 2024 15:46:43 +0200
Subject: [PATCH] $CI_COMMIT_REF_SLUG
---
capif/templates/cd-deploy-ocf.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/capif/templates/cd-deploy-ocf.gitlab-ci.yml b/capif/templates/cd-deploy-ocf.gitlab-ci.yml
index 6f54b47..f33038e 100644
--- a/capif/templates/cd-deploy-ocf.gitlab-ci.yml
+++ b/capif/templates/cd-deploy-ocf.gitlab-ci.yml
@@ -59,7 +59,7 @@ deploy_ocf_staging:
echo "### download dependencies###"
helm dependency build helm/capif
echo "### updating capif###"
- helm upgrade --install -n $NAMESPACE_DEV ocf-staging helm/capif/ --set nginx.nginx.env.capifHostname=capif-$CI_COMMIT_REF_SLUG.$DOMAIN_STAGING \
+ helm upgrade --install -n $NAMESPACE_DEV ocf-staging-$CI_COMMIT_REF_SLUG helm/capif/ --set nginx.nginx.env.capifHostname=capif-$CI_COMMIT_REF_SLUG.$DOMAIN_STAGING \
--set nginx.nginx.env.registerHostname=register-$CI_COMMIT_REF_SLUG.$DOMAIN_STAGING \
--set monitoring.grafana.ingress.hosts[0].host="grafana-$CI_COMMIT_REF_SLUG.$DOMAIN_STAGING" \
--set monitoring.grafana.ingress.hosts[0].paths[0].path="/" \
@@ -102,7 +102,7 @@ delete_ocf_staging:
<<: *staging_common
script:
- echo "### deleting environment $NAMESPACE_STAGING###"
- - helm uninstall -n $NAMESPACE_DEV ocf-staging
+ - helm uninstall -n $NAMESPACE_DEV ocf-staging-$CI_COMMIT_REF_SLUG
when: manual
environment:
name: review/dev_to_staging
@@ -130,7 +130,7 @@ deploy_ocf_oficial_staging:
yq --version
ls -rtt helm/capif
cat helm/capif/Chart.yaml
- yq e -i ".appVersion = \"$IMAGE_TAG_STAGING\"" helm/capif/Chart.yaml
+ yq e -i ".appVersion = \"staging\"" helm/capif/Chart.yaml
cat helm/capif/Chart.yaml
echo "### download dependencies###"
helm dependency build helm/capif
--
GitLab