From fbecaf367d5114c71e70708bb74a6ea7c705ad70 Mon Sep 17 00:00:00 2001 From: Timo Furrer <tfurrer@gitlab.com> Date: Mon, 11 Nov 2024 15:14:12 +0100 Subject: [PATCH] Fix manual destroy jobs Closes https://gitlab.com/components/opentofu/-/issues/82 Changelog: fixed --- templates/full-pipeline.yml | 6 +++--- templates/validate-plan-destroy.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/full-pipeline.yml b/templates/full-pipeline.yml index 9a37e7a..c8ca510 100644 --- a/templates/full-pipeline.yml +++ b/templates/full-pipeline.yml @@ -145,13 +145,13 @@ spec: destroy_rules: default: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - - when: manual + when: manual type: array description: 'Defines the `rules` of the `destroy` job.' delete_state_rules: default: - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - - when: manual + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + when: manual type: array description: 'Defines the `rules` of the `delete-state` job.' warning_on_non_empty_plan: diff --git a/templates/validate-plan-destroy.yml b/templates/validate-plan-destroy.yml index 8168b75..f2cc922 100644 --- a/templates/validate-plan-destroy.yml +++ b/templates/validate-plan-destroy.yml @@ -118,13 +118,13 @@ spec: destroy_rules: default: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - - when: manual + when: manual type: array description: 'Defines the `rules` of the `destroy` job.' delete_state_rules: default: - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - - when: manual + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + when: manual type: array description: 'Defines the `rules` of the `delete-state` job.' warning_on_non_empty_plan: -- GitLab