diff --git a/.gitignore b/.gitignore index 0f8478af54022fd6361f218c4e1ba423a3178b5d..155c863cc5e9e5705fba157406baebab25e5aee7 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,6 @@ chart/charts/*tgz Chart.lock tokens.sh logs/ -*.pyc \ No newline at end of file +*.pyc +dohelm.sh +apply-package-renaming.sh \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6be722fb1dee322c08a96e22e9c5d1ffcfd114f3..cd49e3ca94efc7c3a4ac468b66822ce9a6ae3451 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,8 @@ image: docker:24 build: except: - base-common + rules: + - when: on_success stage: build needs: [] before_script: @@ -34,6 +36,8 @@ build: .deploy: except: - base-common + rules: + - when: on_success stage: deploy needs: - "build" diff --git a/dohelm.sh b/dohelm.sh deleted file mode 100755 index 44a73f1cac74cd0eec3abcd7a2a8a27059876e1a..0000000000000000000000000000000000000000 --- a/dohelm.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -touch tokens.sh -source ./tokens.sh # put `export SECRET_KEY="..."` in this file - -NAMESPACE="rshiny-dev" -CI_PROJECT_NAMESPACE="hub" -CI_PROJECT_NAME="shiny-k8s-example" -CI_REGISTRY="registry-gitlab.pasteur.fr" -CI_REGISTRY_IMAGE="${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}" -CI_COMMIT_SHA=$(git log --format="%H" -n 1) -# CI_COMMIT_SHA="63a65791c93197d280f302a67983756f91b9a1db" -CI_COMMIT_REF_SLUG=$(git branch --show) -INGRESS_CLASS="internal" -PUBLIC_URL="${CI_PROJECT_NAME}-${CI_COMMIT_REF_SLUG}.dev.pasteur.cloud" -IMAGE="${CI_REGISTRY_IMAGE}/${CI_COMMIT_REF_SLUG}:${CI_COMMIT_SHA::8}" -CHART_LOCATION="chart" - -export ACTION="upgrade --install" -export ACTION="template --debug" - -helm ${ACTION} --namespace=${NAMESPACE} \ - --render-subchart-notes \ - --set shiny-k8s-toolkit-helm.ingress.className=${INGRESS_CLASS} \ - --set shiny-k8s-toolkit-helm.ingress.hostname=${PUBLIC_URL} \ - --set shiny-k8s-toolkit-helm.imageFullNameAndTag=${IMAGE} \ - --set shiny-k8s-toolkit-helm.registry.username=${DEPLOY_USER} \ - --set shiny-k8s-toolkit-helm.registry.password=${DEPLOY_TOKEN} \ - --set shiny-k8s-toolkit-helm.registry.host=${CI_REGISTRY} \ - ${CI_COMMIT_REF_SLUG}-${CHART_LOCATION} ./${CHART_LOCATION}/