diff options
| author | John Cai <jcai@gitlab.com> | 2024-01-16 21:33:48 +0300 |
|---|---|---|
| committer | GitLab <noreply@gitlab.com> | 2024-01-16 21:33:48 +0300 |
| commit | 7eb79ebcb084d4e881777f44ca5055cce6e60ccf (patch) | |
| tree | 6023a1ab4890ddf2f6a080e26649787a9b4906a9 | |
| parent | 96b75e53b61c476029d510270daa1d5dfc444a09 (diff) | |
| parent | 37d1d48266df7fa81d8b897b576203e671cfb56c (diff) | |
Merge branch '5743-fix-rails-trigger' into 'master'
Do not pass Gitaly variables to Rails pipeline
Closes #5743
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6617
Merged-by: John Cai <jcai@gitlab.com>
Approved-by: John Cai <jcai@gitlab.com>
Co-authored-by: Lin Jen-Shin <jen-shin@gitlab.com>
| -rw-r--r-- | .gitlab-ci.yml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e321f29ca..ef608ef89 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -514,9 +514,14 @@ rails-specs: project: gitlab-org/gitlab branch: "gitaly-ci-jobs-$CI_PIPELINE_IID" # Using $RAILS_BRANCH_FOR_JOB directly fails strategy: depend + inherit: + variables: false # Otherwise variables will be messed up variables: GITALY_TEST: "true" - FORCE_GITLAB_CI: "true" + ENABLE_RSPEC: "true" + ENABLE_RSPEC_UNIT: "true" + ENABLE_RSPEC_INTEGRATION: "true" + ENABLE_RSPEC_SYSTEM: "true" rules: - when: manual allow_failure: true |