diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d9032643d9858700e964c00e484b06e6c4ef5b4..1080e01591169f5069159967ffb1f5ef73428f18 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,6 @@ workflow: rules: - if: $CI_COMMIT_BRANCH != "master" && $CI_COMMIT_BRANCH != "development" && ($CI_COMMIT_TAG || $CI_COMMIT_BRANCH) variables: - DEPLOY_ENVIRONMENT: "review/${CI_COMMIT_REF_SLUG}" DOCKER_COMPOSER_IMAGE_TAG: $CI_COMMIT_REF_SLUG-composer DOCKER_FPM_IMAGE_TAG: $CI_COMMIT_REF_SLUG DOCKER_NGINX_IMAGE_TAG: $CI_COMMIT_REF_SLUG diff --git a/.gitlab/ci/deploy.yml b/.gitlab/ci/deploy.yml index d362ebd27f20e7c60ae9c3ea38bc5b0a513e4a61..3a2a849f251e9f9b24c9ea541a4b982540094e75 100644 --- a/.gitlab/ci/deploy.yml +++ b/.gitlab/ci/deploy.yml @@ -1,8 +1,16 @@ -deploy: +.deploy: stage: deploy - environment: - name: $DEPLOY_ENVIRONMENT image: alpine/k8s:1.22.6 script: - - printenv - - kubectl -n $KUBE_NAMESPACE get pods \ No newline at end of file + - kubectl -n $KUBE_NAMESPACE get pods + +deploy_review: + extends: + - .deploy + variables: + environment: + name: review/$CI_COMMIT_REF_SLUG + rules: + - if: '$CI_COMMIT_BRANCH != "master" || $CI_COMMIT_BRANCH == "development"' + when: never + - if: '$CI_COMMIT_TAG || $CI_COMMIT_BRANCH' \ No newline at end of file