diff options
| author | Justin Tobler <jtobler@gitlab.com> | 2023-07-13 17:19:30 +0300 |
|---|---|---|
| committer | Justin Tobler <jtobler@gitlab.com> | 2023-07-13 17:36:40 +0300 |
| commit | 31993a0a9374e108a851b30e96e51d8318aeb4cb (patch) | |
| tree | 008ae12e2128e27ecdd2fa862d515407e820f674 /.gitlab-ci.yml | |
| parent | 4d7e56e6eb53c1e8e05b243395d0445ba3e63696 (diff) | |
ci: Fix job rules for `rails-specs` and `rails-specs-cleanup`
For the CI pipeline to run correctly the `rail-specs` job needs the
`start-rails-specs` job to run and the `rails-specs-cleanup` job needs
the `rails-specs` job to run. These jobs have mismatched rules though
preventing them from executing in the same context, which can lead to
pipeline errors.
Make the CI rules for the three jobs all use `rules_run_on_merge` to
ensure they run in the same context.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 80af9ef9a..4a0a72c25 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -542,7 +542,7 @@ rails-specs: GITALY_TEST: "true" FORCE_GITLAB_CI: "true" rules: - - allow_failure: true + - *rules_run_on_merge rails-specs-cleanup: stage: qa @@ -552,7 +552,7 @@ rails-specs-cleanup: curl --request DELETE --header "PRIVATE-TOKEN: $GITLAB_PROJECT_TOKEN" \ "https://gitlab.com/api/v4/projects/278964/repository/branches/$RAILS_BRANCH_FOR_MERGE_REQUEST" rules: - - allow_failure: true + - *rules_run_on_merge build-package-and-qa: needs: [] |