diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c6ec11c952b2d9033db34d604aeca67d5210f7c8..13628763c5b6965edec489d4b99ec976a3d66484 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -144,6 +144,12 @@ build-ippisite: needs: - "test-pg" image: harbor.pasteur.fr/kube-system/helm-kubectl:3.4.0 + before_script: + - export MARVINJS_APIKEY=$MARVINJS_APIKEY_master + - export GACODE=$GACODE_master + - export GALAXY_APIKEY=$GALAXY_APIKEY_master + - export GALAXY_BASE_URL=$GALAXY_BASE_URL_master + - export GALAXY_COMPOUNDPROPERTIES_WORKFLOWID=$GALAXY_COMPOUNDPROPERTIES_WORKFLOWID_master script: - helm dependency update chart - > @@ -156,11 +162,11 @@ build-ippisite: --set registry.password=${DEPLOY_TOKEN} --set registry.host=${CI_REGISTRY} --set imagePullSecrets[0].name="registry-pull-secret-${CI_COMMIT_REF_SLUG}" - --set djangoSecrets.MARVINJS_APIKEY=$(echo "$MARVINJS_APIKEY_master" | base64) - --set djangoSecrets.GACODE=$(echo "$GACODE_master" | base64) - --set djangoSecrets.GALAXY_APIKEY=$(echo "$GALAXY_APIKEY_master" | base64) - --set djangoSecrets.GALAXY_BASE_URL=$(echo "$GALAXY_BASE_URL_master" | base64) - --set djangoSecrets.GALAXY_COMPOUNDPROPERTIES_WORKFLOWID_master=$(echo "$GALAXY_COMPOUNDPROPERTIES_WORKFLOWID_master" | base64) + --set djangoSecrets.MARVINJS_APIKEY=$(echo "$MARVINJS_APIKEY" | base64) + --set djangoSecrets.GACODE=$(echo "$GACODE" | base64) + --set djangoSecrets.GALAXY_APIKEY=$(echo "$GALAXY_APIKEY" | base64) + --set djangoSecrets.GALAXY_BASE_URL=$(echo "$GALAXY_BASE_URL" | base64) + --set djangoSecrets.GALAXY_COMPOUNDPROPERTIES_WORKFLOWID=$(echo "$GALAXY_COMPOUNDPROPERTIES_WORKFLOWID" | base64) --values ./chart/values.${NAMESPACE}.yaml ${CI_COMMIT_REF_SLUG} ./chart/ cache: @@ -217,6 +223,12 @@ deploy-prod: environment: name: "k8sprod-02/ippidb-prod/${CI_COMMIT_REF_SLUG}" url: "https://ippidb-internal.pasteur.cloud" + before_script: + - export MARVINJS_APIKEY=$MARVINJS_APIKEY_release + - export GACODE=$GACODE_release + - export GALAXY_APIKEY=$GALAXY_APIKEY_release + - export GALAXY_BASE_URL=$GALAXY_BASE_URL_release + - export GALAXY_COMPOUNDPROPERTIES_WORKFLOWID=$GALAXY_COMPOUNDPROPERTIES_WORKFLOWID_release delete-dev-deployment: