diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-11-11 15:14:21 +0300 |
|---|---|---|
| committer | Quang-Minh Nguyen <qmnguyen@gitlab.com> | 2022-11-14 11:03:08 +0300 |
| commit | 15ab3666b2777410f317e9f473da79ee388397cd (patch) | |
| tree | 09f4163d410da8b942a6f8e06a2d1ecb829d50c4 | |
| parent | 081d52b6b28437bc8d3a17b6e3d8d80620c640f9 (diff) | |
operations: Structured errors for UserCommitFilesqmnguyen0711/pks-ci-mandatory-fips-builds
The `UserCommitFiles` RPC may in some cases return a successful response
even in cases where an index operation or custom hook fails. This
creates unnecessary replication jobs for changes that did not go through
and causes our logs to misrepresent the request as successful.
To resolve this, return structured errors from this RPC.
Changelog: fixed
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 611399929..5414623d8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -297,12 +297,11 @@ test:fips: when: manual allow_failure: true # Otherwise, we automatically run the job when either merging to the - # default branch or when the merge request has a FIPS label. + # default branch or when the merge request receives the first approval - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - - if: $CI_MERGE_REQUEST_LABELS =~ /FIPS/ - - if: $CI_PIPELINE_SOURCE == "merge_request_event" - when: manual - allow_failure: true + - if: $CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_APPROVED == "true" + when: always + allow_failure: false test:macos: needs: [] |