diff --git a/backports/OpenTofu/Base.latest.gitlab-ci.yml b/backports/OpenTofu/Base.latest.gitlab-ci.yml index 0c2998804d5a6a9f0ded7ec6bc70aa1479181606..16437e6c7b844d05b4188869f71ee5c2d8ece899 100644 --- a/backports/OpenTofu/Base.latest.gitlab-ci.yml +++ b/backports/OpenTofu/Base.latest.gitlab-ci.yml @@ -61,7 +61,6 @@ opentofu:use-component-instead-of-template: - if: $CI_OPEN_MERGE_REQUESTS # Don't add it to a *branch* pipeline if it's already in a merge request pipeline. when: never - if: $CI_COMMIT_BRANCH # If there's no open merge request, add it to a *branch* pipeline instead. - #allow_failure: true allow_failure: true cache: key: "$__CACHE_KEY_HACK" diff --git a/templates/fmt.yml b/templates/fmt.yml index e139f92eb82a3f1fab935dc8f383ebb4f9cf20f6..a1acee8fa343f7a55e83711f01208243c7d95ba8 100644 --- a/templates/fmt.yml +++ b/templates/fmt.yml @@ -45,11 +45,10 @@ spec: default: ${CI_PROJECT_DIR} description: 'Root directory for the OpenTofu project.' - # FIXME: wait for https://gitlab.com/gitlab-org/gitlab/-/merge_requests/142009 - # allow_failure: - # default: true - # type: boolean - # description: 'If the job is allowed to fail or not.' + allow_failure: + default: true + type: boolean + description: 'If the job is allowed to fail or not.' --- @@ -61,8 +60,7 @@ spec: - if: $CI_OPEN_MERGE_REQUESTS # Don't add it to a *branch* pipeline if it's already in a merge request pipeline. when: never - if: $CI_COMMIT_BRANCH # If there's no open merge request, add it to a *branch* pipeline instead. - #allow_failure: $[[ inputs.allow_failure ]] - allow_failure: true + allow_failure: $[[ inputs.allow_failure ]] cache: key: "$__CACHE_KEY_HACK" paths: