Commit 120f3a46 authored by Clement Bois's avatar Clement Bois
Browse files

Merge branch 'fix/plan-opts-in-apply' into 'master' 

fix: pass PLAN_OPTS to refresh plan before apply

Closes #108

See merge request to-be-continuous/terraform!159
parents f4fbfd42 4e8bb148

templates/gitlab-ci-terraform.yml

+5 −0
Original line number Diff line number Diff line
@@ -1128,6 +1128,7 @@ stages: 


# Create job prototype

# @arg ENV_PLAN_ENABLED : environment specific plan to apply (if transfered from upstream jobs)

# @arg ENV_PLAN_OPTS    : environment specific tf plan options (if plan must be refreshed)

# @arg ENV_APPLY_OPTS   : environment specific tf apply options

.tf-create:

  extends: .tf-workspace
@@ -1487,6 +1488,7 @@ tf-review: 
    ENV_WORKSPACE: $TF_REVIEW_WORKSPACE

    ENV_APPLY_OPTS: $TF_REVIEW_APPLY_OPTS

    ENV_PLAN_ENABLED: $TF_REVIEW_PLAN_ENABLED

    ENV_PLAN_OPTS: $TF_REVIEW_PLAN_OPTS

  environment:

    name: review/$CI_COMMIT_REF_NAME

    action: start
@@ -1593,6 +1595,7 @@ tf-integration: 
    ENV_WORKSPACE: $TF_INTEG_WORKSPACE

    ENV_APPLY_OPTS: $TF_INTEG_APPLY_OPTS

    ENV_PLAN_ENABLED: $TF_INTEG_PLAN_ENABLED

    ENV_PLAN_OPTS: $TF_INTEG_PLAN_OPTS

  environment:

    name: integration

    action: start
@@ -1691,6 +1694,7 @@ tf-staging: 
    ENV_WORKSPACE: $TF_STAGING_WORKSPACE

    ENV_APPLY_OPTS: $TF_STAGING_APPLY_OPTS

    ENV_PLAN_ENABLED: $TF_STAGING_PLAN_ENABLED

    ENV_PLAN_OPTS: $TF_STAGING_PLAN_OPTS

  environment:

    name: staging

    action: start
@@ -1802,6 +1806,7 @@ tf-production: 
    ENV_WORKSPACE: $TF_PROD_WORKSPACE

    ENV_APPLY_OPTS: $TF_PROD_APPLY_OPTS

    ENV_PLAN_ENABLED: $TF_PROD_PLAN_ENABLED

    ENV_PLAN_OPTS: $TF_PROD_PLAN_OPTS

  environment:

    name: production

    action: start