diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-29 06:12:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-29 06:12:09 +0300 |
| commit | 951d67d14f7dc504e9b99bc24bc4eb299f7c2a74 (patch) | |
| tree | c67c5e98658efd23f0afa3955d0c48bb0583661d /lib/gitlab/ci/templates/Terraform | |
| parent | c20b560205e7c56a30c80b4fa852270f282caf71 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci/templates/Terraform')
| -rw-r--r-- | lib/gitlab/ci/templates/Terraform/Base.latest.gitlab-ci.yml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/gitlab/ci/templates/Terraform/Base.latest.gitlab-ci.yml b/lib/gitlab/ci/templates/Terraform/Base.latest.gitlab-ci.yml index 47cb043f2ba..a0ec07e61e1 100644 --- a/lib/gitlab/ci/templates/Terraform/Base.latest.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Terraform/Base.latest.gitlab-ci.yml @@ -53,10 +53,9 @@ cache: - cd ${TF_ROOT} - gitlab-terraform apply resource_group: ${TF_STATE_NAME} - when: manual - only: - variables: - - $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + when: manual .terraform:destroy: &terraform_destroy stage: cleanup |