Merge branch 'integration-tests' into 'master'

Improve integration test coverage

See merge request https://gitlab.com/gitlab-org/terraform-images/-/merge_requests/171



Merged-by: João Alexandre Cunha <j.a.cunha@gmail.com>
Approved-by: Tiger Watson <twatson@gitlab.com>
Approved-by: João Alexandre Cunha <j.a.cunha@gmail.com>
Reviewed-by: Tiger Watson <twatson@gitlab.com>
Co-authored-by: Timo Furrer <tfurrer@gitlab.com>

.gitlab-ci.yml

@@ -390,19 +390,22 @@ test-no-wrapper:
     - test $FAILED = true
     - 'cat /tmp/output.txt | grep "Error: Backend initialization required, please run \"terraform init\""'
 
-integration-test:
+integration-test-template:
   stage: test-integration
   variables:
     TERRAFORM_VERSION: $STABLE_VERSION
-    TF_STATE_NAME: ci-$CI_JOB_NAME-$CI_PIPELINE_IID
+    TF_STATE_NAME: ci-integration-test-template-$CI_PIPELINE_IID-$CI_NODE_INDEX
     TF_CACHE_KEY: default
     TF_ROOT: tests
   trigger:
-    include: .gitlab/integration-test/Test-Terraform.gitlab-ci.yml
+    include: .gitlab/integration-test/Test-$TEMPLATE
     strategy: depend
   rules:
     - if: '$CI_PROJECT_PATH == "gitlab-org/terraform-images"'
     - if: '$CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"'
+  parallel:
+    matrix:
+      - TEMPLATE: [Terraform.gitlab-ci.yml, Terraform.latest.gitlab-ci.yml]
 
 release:
   extends: .versions

.gitlab/integration-test/Test-Terraform.gitlab-ci.yml

@@ -12,5 +12,10 @@ image: "$BUILD_IMAGE_NAME"
 # This prevents stalled manual pipelines, but more importantly tests
 # the `apply` wrapper.
 deploy:
+  rules:
+    - when: always
+
+destroy:
+  extends: .terraform:destroy
   rules:
     - when: always
\ No newline at end of file

.gitlab/integration-test/Test-Terraform.latest.gitlab-ci.yml

+workflow:
+  rules:
+    - if: '$CI_PROJECT_PATH == "gitlab-org/terraform-images"'
+
+include:
+  - template: Terraform.latest.gitlab-ci.yml
+
+image: "$BUILD_IMAGE_NAME"
+
+.run-always:
+  rules:
+    - when: always
+
+fmt:
+  rules: !reference [.run-always, rules]
+
+validate:
+  rules: !reference [.run-always, rules]
+
+build:
+  rules: !reference [.run-always, rules]
+
+# The `terraform apply` should always happen for the integration tests.
+# This prevents stalled manual pipelines, but more importantly tests
+# the `apply` wrapper.
+deploy:
+  rules: !reference [.run-always, rules]
+
+destroy:
+  extends: .terraform:destroy
+  rules: !reference [.run-always, rules]
\ No newline at end of file