diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-11-11 15:14:21 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-11-11 15:14:21 +0300 |
| commit | 41920f630981269dd5a9bf3387fc5071035294b4 (patch) | |
| tree | 9e4e98c6f7b3fc3d63dd3fc752a4902825cb266e | |
| parent | 081d52b6b28437bc8d3a17b6e3d8d80620c640f9 (diff) | |
ci: Make FIPS job mandatorypks-ci-mandatory-fips-builds
Right now, the FIPS job is an optional part of our pipeline. This has
caused some pain recently, where our `master` branch was essentially
broken because of the FIPS jobs failing. FIPS is a part of Gitaly now,
and it is not going away anytime soon. So we can just as well embrace
it.
Make the FIPS job mandatory so that we cannot land merge requests that
break them by accident anymore.
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 611399929..f531b0e8a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -289,20 +289,6 @@ test:fips: FIPS_MODE: "YesPlease" # There is no Go 1.19 release yet for the FIPS-based images. GO_VERSION: "1.18" - rules: - # When running in a fork of Gitaly we don't have the runners available, and - # consequentially this job would fail anyway. So we configure the job to be - # a manual one in that case. - - if: $CI_PROJECT_PATH != "gitlab-org/gitaly" - 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. - - 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 test:macos: needs: [] |