Update terraform template to avoid hardcoded master

3d0a75cb · Marcel Amirault · Matija Čupić · e228b0bd · 3d0a75cb · 3d0a75cb
Commit 3d0a75cb authored May 06, 2021 by Marcel Amirault Committed by Matija Čupić May 06, 2021
2 changed files
--- a/changelogs/unreleased/terraform-ci-template-to-default-branch.yml
+++ b/changelogs/unreleased/terraform-ci-template-to-default-branch.yml
+---
+title: Merge branch 'mo-update-artifact-documentation' into 'master'
+merge_request: 61084
+author:
+type: other
--- a/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml
@@ -56,6 +56,6 @@ apply:
    - terraform apply -input=false $PLAN
  dependencies:
    - plan
-  when: manual
+  rules:
-  only:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    - master
+      when: manual