diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 714157b8b851b1552ede9993f4efda7953bb9874..fd1068e2ff142cf16abaa1c1451315abe700dea1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,8 +57,6 @@ build dev on gitlab.pasteur.fr: - envsubst < k8s/front-deployment.yaml | kubectl apply -n "$NAMESPACE" -f - - envsubst < k8s/front-service.yaml | kubectl apply -n "$NAMESPACE" -f - - envsubst < k8s/ingress.yaml | kubectl apply -n "$NAMESPACE" -f - - rules: - - if: $CI_PROJECT_ID == $GITLAB_PASTEUR_PROJECT_ID # gitlab.pasteur.fr only .deploy-with-helm: stage: deploy @@ -78,8 +76,6 @@ build dev on gitlab.pasteur.fr: --set ingress.hosts[0].host="$PUBLIC_URL" --set ingress.hosts[0].paths[0].path="/" --set ingress.hosts[0].paths[0].pathType="Prefix" - rules: - - if: $CI_PROJECT_ID == $GITLAB_PASTEUR_PROJECT_ID # gitlab.pasteur.fr only deploy to pasteur.cloud: extends: .deploy-with-manifests @@ -90,7 +86,8 @@ deploy to pasteur.cloud: name: k8sprod-02/nyx-prod url: https://nyx.pasteur.cloud rules: - - if: $CI_COMMIT_BRANCH == "main" + - if: ($CI_COMMIT_BRANCH == "main" && + $CI_PROJECT_ID == $GITLAB_PASTEUR_PROJECT_ID) # gitlab.pasteur.fr only when: manual deploy to dev.pasteur.cloud: @@ -102,5 +99,6 @@ deploy to dev.pasteur.cloud: name: k8sdev-01/nyx-dev url: https://nyx.dev.pasteur.cloud rules: - - if: $CI_COMMIT_BRANCH == "dev" + - if: ($CI_COMMIT_BRANCH == "dev" && + $CI_PROJECT_ID == $GITLAB_PASTEUR_PROJECT_ID) # gitlab.pasteur.fr only