diff options
| author | John Cai <jcai@gitlab.com> | 2023-07-13 19:12:57 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2023-07-13 19:12:57 +0300 |
| commit | df861664db1db41d5f5a42b40a9b19cdad60a95f (patch) | |
| tree | 00177cd062cd1990de0af530835d366fb8eac739 | |
| parent | 7879c512cb351fa3752aa451d5401cb0b930540e (diff) | |
| parent | 31993a0a9374e108a851b30e96e51d8318aeb4cb (diff) | |
Merge branch 'jt-ci-rails-specs' into 'master'
ci: Fix job rules for `rails-specs` and `rails-specs-cleanup`
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6072
Merged-by: John Cai <jcai@gitlab.com>
Approved-by: John Cai <jcai@gitlab.com>
Co-authored-by: Justin Tobler <jtobler@gitlab.com>
| -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: [] |