diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9765748..e2e2e25 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,33 +30,6 @@ generate-pipeline: - if: '$CI_COMMIT_BRANCH == "master"' - if: '$CI_COMMIT_BRANCH =~ /^feature\/.*/' -# Stage environment -trigger-downstream-stage: - stage: trigger - needs: - - generate-pipeline - trigger: - include: - - artifact: .gitlab-ci.generated.yml - job: generate-pipeline - strategy: depend - variables: - TERRAFORM_IMAGE_NAME: cr.yandex/crp3ccidau046kdj8g9q/terraform/terragrunt:v9.10 - YC_SERVICE_ACCOUNT_KEY_FILE: ${YC_SERVICE_ACCOUNT_KEY_FILE} - YC_CLOUD_ID: ${YC_CLOUD_ID} - YC_STAGE_FOLDER_ID: ${YC_STAGE_FOLDER_ID} - YC_PROD_FOLDER_ID: ${YC_PROD_FOLDER_ID} - YC_PREPROD_FOLDER_ID: ${YC_PREPROD_FOLDER_ID} - S3_ACCESS_KEY: ${S3_ACCESS_KEY} - S3_SECRET_KEY: ${S3_SECRET_KEY} - S3_STATE_BUCKET: ${S3_STATE_BUCKET} - AWS_ACCESS_KEY_ID: ${S3_ACCESS_KEY} - AWS_SECRET_ACCESS_KEY: ${S3_SECRET_KEY} - TARGET_ENV: "stage" - rules: - - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - - if: '$CI_COMMIT_BRANCH == "stage"' - - if: '$CI_COMMIT_BRANCH =~ /^feature\/.*/' # Prod environment trigger-downstream-prod: @@ -82,4 +55,6 @@ trigger-downstream-prod: AWS_SECRET_ACCESS_KEY: ${S3_PROD_SECRET_KEY} TARGET_ENV: "prod" rules: + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_COMMIT_BRANCH == "master"' + - if: '$CI_COMMIT_BRANCH =~ /^feature\/.*/'