diff --git a/backports/OpenTofu/Base.latest.gitlab-ci.yml b/backports/OpenTofu/Base.latest.gitlab-ci.yml index 88f02bc16c02ec4a79f30883a19ebd996e6a358e..20df4801c7aed5d4fead0b610f35adfc692a1361 100644 --- a/backports/OpenTofu/Base.latest.gitlab-ci.yml +++ b/backports/OpenTofu/Base.latest.gitlab-ci.yml @@ -59,7 +59,6 @@ variables: - 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: "$TF_ROOT" diff --git a/templates/fmt.yml b/templates/fmt.yml index 730f1a836328fdbad19784facc68e21f856a6ea6..3736c72b8706544a352fbd93117a3ac08bccd124 100644 --- a/templates/fmt.yml +++ b/templates/fmt.yml @@ -40,11 +40,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.' --- @@ -56,8 +55,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: "$[[ inputs.root_dir ]]" paths: