Merge branch '299770-migrate-terraform-template' into 'master'

Migrate Terraform template to use rules syntax See merge request gitlab-org/gitlab!69634

Merge branch '299770-migrate-terraform-template' into 'master'
Migrate Terraform template to use rules syntax See merge request gitlab-org/gitlab!69634
1f3add41 · Shinya Maeda · 11da5cd8 · a8684074 · 1f3add41
Commit 1f3add41 authored Oct 29, 2021 by Shinya Maeda
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

lib/gitlab/ci/templates/Terraform/Base.latest.gitlab-ci.yml lib/gitlab/ci/templates/Terraform/Base.latest.gitlab-ci.yml +3 -4

No files found.
--- 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}
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
      when: manual
-  only:
-    variables:
-      - $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 .terraform:destroy: &terraform_destroy
  stage: cleanup