Commit b37c270c authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch... 

Merge branch '72-tf-plan-production-on-review-branch-needs-to-be-maintainer-and-it-s-a-bad-practice' into 'master'

don't lock production plan on review branch

See merge request to-be-continuous/terraform!108
parents 8b448c16 b61219f5

templates/gitlab-ci-terraform.yml

+5 −1
Original line number Diff line number Diff line
@@ -808,7 +808,7 @@ stages: 
    fi



    # shellcheck disable=SC2154,SC2086,SC2046

    terraform plan ${env_vars:+-var-file=${env_vars}} -out "$tf_plan" $(echo "$extra_opts" | envsubst_cli) $(echo "$opts" | envsubst_cli)

    terraform plan ${env_vars:+-var-file=${env_vars}} ${TF_PLAN_LOCK:+-lock=$TF_PLAN_LOCK} -out "$tf_plan" $(echo "$extra_opts" | envsubst_cli) $(echo "$opts" | envsubst_cli)



    # then generate GitLab TF report

    if ! command -v jq > /dev/null
@@ -1478,7 +1478,11 @@ tf-plan-production: 
      when: never

    # enabled on merge requests (2 rules depending on the selected workflow)

    - if: $CI_OPEN_MERGE_REQUESTS

      variables:

        TF_PLAN_LOCK: "false"

    - if: '$CI_MERGE_REQUEST_ID && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ $PROD_REF'

      variables:

        TF_PLAN_LOCK: "false"

    # enabled on production branches

    - if: '$CI_COMMIT_REF_NAME =~ $PROD_REF'