diff options
| author | Toon Claes <toon@gitlab.com> | 2022-10-27 15:40:53 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2022-11-09 17:10:03 +0300 |
| commit | a2b3dc0df3d5cf4b9e1fc1b9caec1b9b25da8e13 (patch) | |
| tree | cb96b5d730852346858ca771fe18b2b2f8141ae5 | |
| parent | b139427cc29e65616002afec083968134b25151c (diff) | |
ci: Trigger QA on merged result
When merged result pipelines are enabled we had to set
GITALY_SERVER_VERSION to the source branch SHA of the MR, otherwise QA
wouldn't find this commit.
This issue was reported in [1], and that's now fixed. So we can now
remove that work around and run QA against merged result commits.
[1]: https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6482
| -rw-r--r-- | .gitlab-ci.yml | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 664cef42f..9752897fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -443,13 +443,6 @@ trigger-qa: GITALY_SERVER_ALTERNATIVE_REPO: $CI_PROJECT_URL ee: "true" rules: - - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_SHA != "" - when: manual - allow_failure: true - variables: - # Downstream pipeline does not fetch the merged result SHA. - # Fix: https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6482 - GITALY_SERVER_VERSION: $CI_MERGE_REQUEST_SOURCE_BRANCH_SHA - when: manual allow_failure: true |