From f87d1757aab2cf9acf0de4411cd48a74a6b46004 Mon Sep 17 00:00:00 2001
From: Timo Furrer <tfurrer@gitlab.com>
Date: Fri, 26 Jan 2024 13:48:11 +0100
Subject: [PATCH] Run warn job in base template
---
backports/.Base.latest.gitlab-ci.yml | 2 +-
backports/OpenTofu.latest.gitlab-ci.yml | 3 ---
backports/OpenTofu/Base.latest.gitlab-ci.yml | 2 +-
tests/integration-tests/BackportTemplates.gitlab-ci.yml | 3 ---
4 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/backports/.Base.latest.gitlab-ci.yml b/backports/.Base.latest.gitlab-ci.yml
index 32e1214..70d7a0e 100644
--- a/backports/.Base.latest.gitlab-ci.yml
+++ b/backports/.Base.latest.gitlab-ci.yml
@@ -24,7 +24,7 @@ variables:
# The name of the state file used by the GitLab Managed Terraform state backend
TF_STATE_NAME: default
-.opentofu:use-component-instead-of-template:
+opentofu:use-component-instead-of-template:
stage: .pre
needs: []
allow_failure: true
diff --git a/backports/OpenTofu.latest.gitlab-ci.yml b/backports/OpenTofu.latest.gitlab-ci.yml
index 6448a43..7932b28 100644
--- a/backports/OpenTofu.latest.gitlab-ci.yml
+++ b/backports/OpenTofu.latest.gitlab-ci.yml
@@ -17,9 +17,6 @@ include:
stages: [validate, build, deploy]
-use-component-instead-of-template:
- extends: .opentofu:use-component-instead-of-template
-
fmt:
extends: .opentofu:fmt
diff --git a/backports/OpenTofu/Base.latest.gitlab-ci.yml b/backports/OpenTofu/Base.latest.gitlab-ci.yml
index 88f02bc..2672ebe 100644
--- a/backports/OpenTofu/Base.latest.gitlab-ci.yml
+++ b/backports/OpenTofu/Base.latest.gitlab-ci.yml
@@ -24,7 +24,7 @@ variables:
# The name of the state file used by the GitLab Managed Terraform state backend
TF_STATE_NAME: default
-.opentofu:use-component-instead-of-template:
+opentofu:use-component-instead-of-template:
stage: .pre
needs: []
allow_failure: true
diff --git a/tests/integration-tests/BackportTemplates.gitlab-ci.yml b/tests/integration-tests/BackportTemplates.gitlab-ci.yml
index dcda86b..96ae6de 100644
--- a/tests/integration-tests/BackportTemplates.gitlab-ci.yml
+++ b/tests/integration-tests/BackportTemplates.gitlab-ci.yml
@@ -5,9 +5,6 @@ stages: [validate, test, build, deploy, cleanup]
# Required to run everything immediately, instead of manually.
-use-component-instead-of-template:
- extends: .opentofu:use-component-instead-of-template
-
fmt:
extends: .opentofu:fmt
rules: [{when: always}]
--
GitLab