From cac0823bf6550b67783e74a31b6d8d628f375f35 Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Fri, 14 Jun 2024 16:11:10 +0200
Subject: [PATCH] refactor public URL, bugfix in curl checking this url
---
.gitlab-ci.yml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fbe81cd..2d6d004 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,12 +2,14 @@ generate:
stage: build
needs: []
image: harbor.pasteur.fr/kube-system/helm-kubectl:3.12.0
+ variables:
+ PUBLIC_URL: "${CI_PROJECT_NAME}-test-${VALUES_SUFFIX}.dev.pasteur.cloud"
script:
- mkdir -p out-templates
- helm dependency update ./test-chart/
- >
helm template
- --set shiny-k8s-toolkit-helm.ingress.hostname=${CI_PROJECT_NAME}-test-${VALUES_SUFFIX}.dev.pasteur.cloud
+ --set shiny-k8s-toolkit-helm.ingress.hostname=${PUBLIC_URL}
--values ./test-chart/values.yaml
--values ./test-chart/values-${VALUES_SUFFIX}.yaml
test-${VALUES_SUFFIX} ./test-chart/ > out-templates/test-${VALUES_SUFFIX}.yaml
@@ -41,6 +43,7 @@ test-applying:
image: harbor.pasteur.fr/kube-system/helm-kubectl:3.12.0
variables:
NAMESPACE: "rshiny-dev"
+ PUBLIC_URL: "${CI_PROJECT_NAME}-test-${VALUES_SUFFIX}.dev.pasteur.cloud"
environment:
name: "k8sdev-01/${NAMESPACE}/helm-test"
url: "https://${CI_PROJECT_NAME}-${CI_COMMIT_REF_SLUG}.dev.pasteur.cloud"
@@ -50,12 +53,12 @@ test-applying:
- >
helm upgrade --install --namespace=${NAMESPACE}
--render-subchart-notes
- --set shiny-k8s-toolkit-helm.ingress.hostname=${CI_PROJECT_NAME}-test-${VALUES_SUFFIX}.dev.pasteur.cloud
+ --set shiny-k8s-toolkit-helm.ingress.hostname=${PUBLIC_URL}
--values ./test-chart/values.yaml
--values ./test-chart/values-${VALUES_SUFFIX}.yaml
test-${VALUES_SUFFIX} ./test-chart/ --wait
- echo "Applyied and running for k8s, checking is url is responding."
- - curl --retry 60 --retry-delay 1 -s -o /dev/null "https://shiny-k8s-example-base-python.dev.pasteur.cloud/"
+ - curl --retry 60 --retry-delay 1 -s -o /dev/null ${PUBLIC_URL}
- echo "Receive http 200, instance ok, removing it."
- helm delete test-${VALUES_SUFFIX} --wait
parallel:
--
GitLab