Commit 9075f0c9 authored by Thomas Boni's avatar Thomas Boni
Browse files

Merge branch '454-terraform-job-breaks-pipeline' into 'latest' 

Resolve "Terraform job breaks pipeline"

Closes #454

See merge request r2devops/hub!274
parents b3b025f7 1cdf091f

jobs/gitlab-terraform_apply/README.md

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ This job will apply all the changes set by `gitlab-terraform_plan` in the file ` 


* Job name: `gitlab-terraform_apply`

* Docker image:

[`registry.gitlab.com/gitlab-org/terraform-images/releases/1.0:v0.19.1`](https://gitlab.com/gitlab-org/terraform-images)

[`registry.gitlab.com/gitlab-org/terraform-images/releases/1.0:v0.20.0`](https://gitlab.com/gitlab-org/terraform-images)

* Default stage: `deploy`

* When: `always`

jobs/gitlab-terraform_apply/gitlab-terraform_apply.yml

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ cache: 


gitlab-terraform_apply:

  stage: deploy

  image: registry.gitlab.com/gitlab-org/terraform-images/releases/1.0:v0.19.1

  image: registry.gitlab.com/gitlab-org/terraform-images/releases/1.0:v0.20.0



  variables:

    TF_ADDRESS: ""

jobs/gitlab-terraform_apply/job.yml

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ icon: 🔷 
maintainer: totara-thib

license: MIT

images:

  registry.gitlab.com/gitlab-org/terraform-images/releases/1.0:v0.19.1

  registry.gitlab.com/gitlab-org/terraform-images/releases/1.0:v0.20.0

tools:

labels:

  - GitLab

jobs/gitlab-terraform_apply/versions/0.2.0.md

0 → 100644
+1 −0
Original line number Diff line number Diff line 
* Update the docker image used 
 No newline at end of file

jobs/gitlab-terraform_plan/README.md

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ This job will initialize a working directory containing Terraform configuration 


* Job name: `gitlab-terraform_plan`

* Docker image:

[`registry.gitlab.com/gitlab-org/terraform-images/releases/1.0:v0.19.1`](https://gitlab.com/gitlab-org/terraform-images)

[`registry.gitlab.com/gitlab-org/terraform-images/releases/1.0:v0.20.0`](https://gitlab.com/gitlab-org/terraform-images)

* Default stage: `provision`

* When: `always`