From 99bc57dc17fedc8ecffaae07920d8e6049583613 Mon Sep 17 00:00:00 2001
From: Timo Furrer <tfurrer@gitlab.com>
Date: Fri, 19 Jan 2024 09:01:57 +0100
Subject: [PATCH] Fix rules in delete-state job
---
backports/.Base.gitlab-ci.yml | 2 +-
backports/OpenTofu/Base.gitlab-ci.yml | 4 +---
templates/full-pipeline.yml | 2 --
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/backports/.Base.gitlab-ci.yml b/backports/.Base.gitlab-ci.yml
index f0cc2ac..5bfc854 100644
--- a/backports/.Base.gitlab-ci.yml
+++ b/backports/.Base.gitlab-ci.yml
@@ -14,7 +14,7 @@
variables:
# OpenTofu CI/CD component version, see https://gitlab.com/components/opentofu/-/releases
- VERSION: "0.1.0"
+ VERSION: "latest"
# Compatible OpenTofu version, see https://gitlab.com/components/opentofu/-/releases
OPENTOFU_VERSION: "1.6.0"
# Job Image with `gitlab-tofu`
diff --git a/backports/OpenTofu/Base.gitlab-ci.yml b/backports/OpenTofu/Base.gitlab-ci.yml
index 2e8d063..c8c1fa3 100644
--- a/backports/OpenTofu/Base.gitlab-ci.yml
+++ b/backports/OpenTofu/Base.gitlab-ci.yml
@@ -14,7 +14,7 @@
variables:
# OpenTofu CI/CD component version, see https://gitlab.com/components/opentofu/-/releases
- VERSION: "0.1.0"
+ VERSION: "latest"
# Compatible OpenTofu version, see https://gitlab.com/components/opentofu/-/releases
OPENTOFU_VERSION: "1.6.0"
# Job Image with `gitlab-tofu`
@@ -149,8 +149,6 @@ variables:
extends: .opentofu:default
stage: cleanup
resource_group: $TF_STATE_NAME
- rules:
- - when: never
script:
- curl --request DELETE -u "gitlab-ci-token:$CI_JOB_TOKEN" "$CI_API_V4_URL/projects/$CI_PROJECT_ID/terraform/state/$TF_STATE_NAME"
rules:
diff --git a/templates/full-pipeline.yml b/templates/full-pipeline.yml
index ba00d1e..297ecad 100644
--- a/templates/full-pipeline.yml
+++ b/templates/full-pipeline.yml
@@ -161,8 +161,6 @@ delete-state:
stage: $[[ inputs.stage_cleanup ]]
needs: [destroy]
resource_group: $[[ inputs.state_name ]]
- rules:
- - when: never
script:
- curl --request DELETE -u "gitlab-ci-token:$CI_JOB_TOKEN" "$CI_API_V4_URL/projects/$CI_PROJECT_ID/terraform/state/$[[ inputs.state_name ]]"
rules:
--
GitLab