Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ plan_terraform_prod:
VAULT_TOKEN: $VAULT_TOKEN_PROD
tags:
- production
only:
- master
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- if: $CI_PIPELINE_SOURCE == "trigger"

.apply_terraform: &apply_terraform
stage: apply_terraform
Expand All @@ -60,7 +61,9 @@ apply_terraform_dev:
VAULT_TOKEN: $VAULT_TOKEN_DEV
tags:
- development
when: manual
rules:
- if: $CI_PIPELINE_SOURCE == "trigger"
- when: manual
allow_failure: false

apply_terraform_prod:
Expand All @@ -73,7 +76,7 @@ apply_terraform_prod:
VAULT_TOKEN: $VAULT_TOKEN_PROD
tags:
- production
only:
- master
when: manual
allow_failure: false
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: manual
- if: $CI_PIPELINE_SOURCE == "trigger"