summaryrefslogtreecommitdiff
path: root/lib/gitlab
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-10 00:10:04 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-10 00:10:04 +0000
commit1bf4fece121298260663c6ca73d39716d3548a03 (patch)
tree5c82dd2fa63552ecb67fcb034740ec7e8fdba25a /lib/gitlab
parent254ec28f5448f6f353cd98f637985de3d1405854 (diff)
downloadgitlab-ce-1bf4fece121298260663c6ca73d39716d3548a03.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab')
-rw-r--r--lib/gitlab/ci/templates/Terraform.gitlab-ci.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml b/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml
index dc70b977452..83483108fde 100644
--- a/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml
@@ -12,6 +12,7 @@ image:
# Default output file for Terraform plan
variables:
PLAN: plan.tfplan
+ JSON_PLAN_FILE: tfplan.json
cache:
paths:
@@ -37,11 +38,13 @@ plan:
stage: build
script:
- terraform plan -out=$PLAN
- - "terraform show --json $PLAN | convert_report > tfplan.json"
+ - "terraform show --json $PLAN | convert_report > $JSON_PLAN_FILE"
artifacts:
name: plan
paths:
- $PLAN
+ reports:
+ terraform: $JSON_PLAN_FILE
# Separate apply job for manual launching Terraform as it can be destructive
# action.