From b6ee92cb60c42c77834f145b5b23dc42158442d2 Mon Sep 17 00:00:00 2001 From: Ernesto Puerta Date: Fri, 4 Dec 2020 18:32:41 +0100 Subject: [PATCH] ceph-{api,dashboard}-pr: fix source branch ref Applying same change as already applied by https://github.com/ceph/ceph-build/pull/1426. A divergence has been observed between `make check` job (ceph-pull-request) and the `make` in ceph-pr-api job. For the same PR: * ceph-pull-request `make check` passes * ceph-pr-api `make` fails This fix has been suggested by @sebastian-philipp Signed-off-by: Ernesto Puerta --- .../config/definitions/ceph-dashboard-pull-requests.yml | 2 +- ceph-pr-api/config/definitions/ceph-pr-api.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ceph-dashboard-pull-requests/config/definitions/ceph-dashboard-pull-requests.yml b/ceph-dashboard-pull-requests/config/definitions/ceph-dashboard-pull-requests.yml index 0753e6c8f..e95cd6a08 100644 --- a/ceph-dashboard-pull-requests/config/definitions/ceph-dashboard-pull-requests.yml +++ b/ceph-dashboard-pull-requests/config/definitions/ceph-dashboard-pull-requests.yml @@ -53,7 +53,7 @@ - git: url: https://github.com/ceph/ceph.git branches: - - ${sha1} + - origin/pr/${ghprbPullId}/merge refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/* browser: auto timeout: 20 diff --git a/ceph-pr-api/config/definitions/ceph-pr-api.yml b/ceph-pr-api/config/definitions/ceph-pr-api.yml index da64e54bb..573b3cf45 100644 --- a/ceph-pr-api/config/definitions/ceph-pr-api.yml +++ b/ceph-pr-api/config/definitions/ceph-pr-api.yml @@ -72,7 +72,7 @@ - git: url: https://github.com/ceph/ceph.git branches: - - ${sha1} + - origin/pr/${ghprbPullId}/merge refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/* browser: auto timeout: 20 -- 2.47.3