From: Kefu Chai <kchai@redhat.com>
Date: Sat, 7 Sep 2019 06:53:26 +0000 (+0800)
Subject: */scm: only pull the PR under test
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4eae5698a6a1383c69338ec7781e4cee6c087a9f;p=ceph-build.git

*/scm: only pull the PR under test

see
https://github.com/jenkinsci/ghprb-plugin/blob/master/README.md#creating-a-job

no need to pull all PR references of the remote repo. it'd be faster
just pull the references of a single PR. actually, what we need is but

- refs/pull/${pr}/head
- refs/pull/${pr}/merge

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/ceph-ansible-docs-prs/config/definitions/ceph-ansible-docs-prs.yml b/ceph-ansible-docs-prs/config/definitions/ceph-ansible-docs-prs.yml
index fe2fc401..592a7dec 100644
--- a/ceph-ansible-docs-prs/config/definitions/ceph-ansible-docs-prs.yml
+++ b/ceph-ansible-docs-prs/config/definitions/ceph-ansible-docs-prs.yml
@@ -20,7 +20,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
diff --git a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
index 452ec97f..9e83909d 100644
--- a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
+++ b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
@@ -20,7 +20,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
@@ -924,7 +927,7 @@
           url: https://github.com/ceph/ceph-ansible.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 60
           skip-tag: true
diff --git a/ceph-ansible-pr-syntax-check/config/definitions/ceph-ansible-pr-syntax-check.yml b/ceph-ansible-pr-syntax-check/config/definitions/ceph-ansible-pr-syntax-check.yml
index 84a0db78..8aeac6d8 100644
--- a/ceph-ansible-pr-syntax-check/config/definitions/ceph-ansible-pr-syntax-check.yml
+++ b/ceph-ansible-pr-syntax-check/config/definitions/ceph-ansible-pr-syntax-check.yml
@@ -5,7 +5,7 @@
           url: https://github.com/ceph/ceph-ansible.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -35,7 +35,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
index bb9af305..17d1aa4d 100644
--- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
+++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
@@ -265,7 +265,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
@@ -289,7 +292,7 @@
           url: https://github.com/ceph/ceph-ansible.git
           branches:
             - ${{sha1}}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
           browser: auto
           timeout: 20
           skip-tag: true
diff --git a/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml b/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml
index 58a3738f..0ba70307 100644
--- a/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml
+++ b/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml
@@ -64,7 +64,7 @@
           url: https://github.com/ceph/ceph-ansible.git
           branches:
             - $BRANCH
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           skip-tag: true
diff --git a/ceph-build-pull-requests/config/definitions/ceph-build-pull-requests.yml b/ceph-build-pull-requests/config/definitions/ceph-build-pull-requests.yml
index e4c6a1a7..445754e2 100644
--- a/ceph-build-pull-requests/config/definitions/ceph-build-pull-requests.yml
+++ b/ceph-build-pull-requests/config/definitions/ceph-build-pull-requests.yml
@@ -21,7 +21,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
@@ -42,7 +45,7 @@
           url: https://github.com/ceph/ceph-build.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           skip-tag: true
diff --git a/ceph-container-flake8/config/definitions/ceph-container-flake8.yml b/ceph-container-flake8/config/definitions/ceph-container-flake8.yml
index 99b638c4..002aedc6 100644
--- a/ceph-container-flake8/config/definitions/ceph-container-flake8.yml
+++ b/ceph-container-flake8/config/definitions/ceph-container-flake8.yml
@@ -5,7 +5,7 @@
           url: https://github.com/ceph/ceph-container.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -29,7 +29,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
diff --git a/ceph-container-lint/config/definitions/ceph-container-lint.yml b/ceph-container-lint/config/definitions/ceph-container-lint.yml
index b71e7985..c4b76165 100644
--- a/ceph-container-lint/config/definitions/ceph-container-lint.yml
+++ b/ceph-container-lint/config/definitions/ceph-container-lint.yml
@@ -5,7 +5,7 @@
           url: https://github.com/ceph/ceph-container.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -29,7 +29,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
diff --git a/ceph-container-prs/config/definitions/ceph-container-prs.yml b/ceph-container-prs/config/definitions/ceph-container-prs.yml
index 6a18caf1..05524c86 100644
--- a/ceph-container-prs/config/definitions/ceph-container-prs.yml
+++ b/ceph-container-prs/config/definitions/ceph-container-prs.yml
@@ -35,7 +35,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
@@ -59,7 +62,7 @@
           url: https://github.com/ceph/ceph-container.git
           branches:
             - ${{sha1}}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -107,7 +110,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
@@ -131,7 +137,7 @@
           url: https://github.com/ceph/ceph-container.git
           branches:
             - ${{sha1}}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
           browser: auto
           timeout: 20
           skip-tag: true
diff --git a/ceph-dashboard-pr-backend/config/definitions/ceph-dashboard-pr-backend.yml b/ceph-dashboard-pr-backend/config/definitions/ceph-dashboard-pr-backend.yml
index 24b0b51c..e9545981 100644
--- a/ceph-dashboard-pr-backend/config/definitions/ceph-dashboard-pr-backend.yml
+++ b/ceph-dashboard-pr-backend/config/definitions/ceph-dashboard-pr-backend.yml
@@ -23,7 +23,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
@@ -49,7 +52,7 @@
           url: https://github.com/ceph/ceph.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           skip-tag: true
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 64a25164..2c44a837 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
@@ -23,7 +23,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
@@ -50,7 +53,7 @@
           url: https://github.com/ceph/ceph.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           skip-tag: true
diff --git a/ceph-deploy-pull-requests/config/definitions/ceph-deploy-pull-requests.yml b/ceph-deploy-pull-requests/config/definitions/ceph-deploy-pull-requests.yml
index 4e8801c2..5e3e57b6 100644
--- a/ceph-deploy-pull-requests/config/definitions/ceph-deploy-pull-requests.yml
+++ b/ceph-deploy-pull-requests/config/definitions/ceph-deploy-pull-requests.yml
@@ -8,7 +8,7 @@
           url: https://github.com/ceph/ceph-deploy.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -50,7 +50,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
diff --git a/ceph-iscsi-cli-flake8/config/definitions/ceph-iscsi-config-flake8.yml b/ceph-iscsi-cli-flake8/config/definitions/ceph-iscsi-config-flake8.yml
index 4f428a38..22c71a06 100644
--- a/ceph-iscsi-cli-flake8/config/definitions/ceph-iscsi-config-flake8.yml
+++ b/ceph-iscsi-cli-flake8/config/definitions/ceph-iscsi-config-flake8.yml
@@ -5,7 +5,7 @@
           url: https://github.com/ceph/ceph-iscsi-cli.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -36,7 +36,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
diff --git a/ceph-iscsi-config-flake8/config/definitions/ceph-iscsi-config-flake8.yml b/ceph-iscsi-config-flake8/config/definitions/ceph-iscsi-config-flake8.yml
index c9453160..11501afd 100644
--- a/ceph-iscsi-config-flake8/config/definitions/ceph-iscsi-config-flake8.yml
+++ b/ceph-iscsi-config-flake8/config/definitions/ceph-iscsi-config-flake8.yml
@@ -5,7 +5,7 @@
           url: https://github.com/ceph/ceph-iscsi-config.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -36,7 +36,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
diff --git a/ceph-iscsi-tox/config/definitions/ceph-iscsi-tox.yml b/ceph-iscsi-tox/config/definitions/ceph-iscsi-tox.yml
index 61c19def..38759cea 100644
--- a/ceph-iscsi-tox/config/definitions/ceph-iscsi-tox.yml
+++ b/ceph-iscsi-tox/config/definitions/ceph-iscsi-tox.yml
@@ -5,7 +5,7 @@
           url: https://github.com/ceph/ceph-iscsi.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -36,7 +36,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
diff --git a/ceph-medic-pull-requests/config/definitions/ceph-medic-pull-requests.yml b/ceph-medic-pull-requests/config/definitions/ceph-medic-pull-requests.yml
index 2af2261b..72132fd4 100644
--- a/ceph-medic-pull-requests/config/definitions/ceph-medic-pull-requests.yml
+++ b/ceph-medic-pull-requests/config/definitions/ceph-medic-pull-requests.yml
@@ -5,7 +5,7 @@
           url: https://github.com/ceph/ceph-medic
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           basedir: "ceph-medic"
@@ -38,7 +38,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
diff --git a/ceph-pr-commits/config/definitions/ceph-pr-commits.yml b/ceph-pr-commits/config/definitions/ceph-pr-commits.yml
index e2892b63..d7c0923d 100644
--- a/ceph-pr-commits/config/definitions/ceph-pr-commits.yml
+++ b/ceph-pr-commits/config/definitions/ceph-pr-commits.yml
@@ -5,7 +5,7 @@
           url: https://github.com/ceph/ceph.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -47,7 +47,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
diff --git a/ceph-pr-docs/config/definitions/ceph-pr-docs.yml b/ceph-pr-docs/config/definitions/ceph-pr-docs.yml
index d0a08300..1cf300a3 100644
--- a/ceph-pr-docs/config/definitions/ceph-pr-docs.yml
+++ b/ceph-pr-docs/config/definitions/ceph-pr-docs.yml
@@ -38,7 +38,7 @@
           browser: auto
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           skip-tag: true
           timeout: 20
           wipe-workspace: true
diff --git a/ceph-pr-render-docs/config/definitions/ceph-pr-render-docs.yml b/ceph-pr-render-docs/config/definitions/ceph-pr-render-docs.yml
index ea9af526..a857fff3 100644
--- a/ceph-pr-render-docs/config/definitions/ceph-pr-render-docs.yml
+++ b/ceph-pr-render-docs/config/definitions/ceph-pr-render-docs.yml
@@ -38,7 +38,7 @@
           browser: auto
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           skip-tag: true
           timeout: 20
           wipe-workspace: true
diff --git a/ceph-pr-submodules/config/definitions/ceph-pr-commits.yml b/ceph-pr-submodules/config/definitions/ceph-pr-commits.yml
index 3c98a19a..bb04a851 100644
--- a/ceph-pr-submodules/config/definitions/ceph-pr-commits.yml
+++ b/ceph-pr-submodules/config/definitions/ceph-pr-commits.yml
@@ -20,7 +20,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
@@ -42,7 +45,7 @@
           url: https://github.com/ceph/ceph.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           skip-tag: true
diff --git a/ceph-pull-requests-arm64/config/definitions/ceph-pull-requests-arm64.yml b/ceph-pull-requests-arm64/config/definitions/ceph-pull-requests-arm64.yml
index 6adcab91..4c14df0a 100644
--- a/ceph-pull-requests-arm64/config/definitions/ceph-pull-requests-arm64.yml
+++ b/ceph-pull-requests-arm64/config/definitions/ceph-pull-requests-arm64.yml
@@ -12,9 +12,12 @@
     node: arm64
     parameters:
     - string:
-        default: origin/master
-        description: A pull request ID, like 'origin/pr/72/head'
         name: sha1
+        description: "commit id or a refname, like 'origin/pr/72/head'"
+        default: origin/master
+    - string:
+        name: ghprbPullId
+        description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
     project-type: freestyle
     properties:
     - build-discarder:
@@ -46,7 +49,7 @@
           <userRemoteConfigs>
           <hudson.plugins.git.UserRemoteConfig>
           <name>origin</name>
-          <refspec>+refs/pull/*:refs/remotes/origin/pr/*</refspec>
+          <refspec>+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*</refspec>
           <url>https://github.com/ceph/ceph.git</url>
           </hudson.plugins.git.UserRemoteConfig>
           </userRemoteConfigs>
diff --git a/ceph-pull-requests/config/definitions/ceph-pull-requests.yml b/ceph-pull-requests/config/definitions/ceph-pull-requests.yml
index 333b1af0..1be3e2f6 100644
--- a/ceph-pull-requests/config/definitions/ceph-pull-requests.yml
+++ b/ceph-pull-requests/config/definitions/ceph-pull-requests.yml
@@ -23,7 +23,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
@@ -46,7 +49,7 @@
           url: https://github.com/ceph/ceph.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           skip-tag: true
diff --git a/ceph-qa-suite-pull-requests/config/definitions/ceph-qa-suite-pull-requests.yml b/ceph-qa-suite-pull-requests/config/definitions/ceph-qa-suite-pull-requests.yml
index b2daa02e..85c851e9 100644
--- a/ceph-qa-suite-pull-requests/config/definitions/ceph-qa-suite-pull-requests.yml
+++ b/ceph-qa-suite-pull-requests/config/definitions/ceph-qa-suite-pull-requests.yml
@@ -21,7 +21,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
@@ -50,7 +53,7 @@
           url: https://github.com/ceph/ceph-qa-suite.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           skip-tag: true
diff --git a/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml b/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml
index 55ea2c35..e3b1bc15 100644
--- a/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml
+++ b/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml
@@ -89,7 +89,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
       # this is injected by the ghprb plugin, and is fully optional but may help in manually triggering
       # a job that can end up updating a PR
@@ -128,7 +131,7 @@
           url: https://github.com/ceph/ceph.git
           branches:
             - ${{sha1}}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
           browser: auto
           timeout: 20
           skip-tag: true
diff --git a/ceph-volume-pr/config/definitions/ceph-volume-pr.yml b/ceph-volume-pr/config/definitions/ceph-volume-pr.yml
index f1550cbe..c1ae7881 100644
--- a/ceph-volume-pr/config/definitions/ceph-volume-pr.yml
+++ b/ceph-volume-pr/config/definitions/ceph-volume-pr.yml
@@ -17,7 +17,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
       # this is injected by the ghprb plugin, and is fully optional but may help in manually triggering
       # a job that can end up updating a PR
@@ -53,7 +56,7 @@
           browser: auto
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           skip-tag: true
           timeout: 20
           wipe-workspace: true
diff --git a/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml b/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml
index 126e1097..956387cb 100644
--- a/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml
+++ b/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml
@@ -46,7 +46,7 @@
           url: $CEPH_REPO_URL
           branches:
             - $CEPH_BRANCH
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           skip-tag: true
diff --git a/cephmetrics-pull-requests/config/definitions/cephmetrics-pull-requests.yml b/cephmetrics-pull-requests/config/definitions/cephmetrics-pull-requests.yml
index b3f7231b..37a0a5da 100644
--- a/cephmetrics-pull-requests/config/definitions/cephmetrics-pull-requests.yml
+++ b/cephmetrics-pull-requests/config/definitions/cephmetrics-pull-requests.yml
@@ -21,7 +21,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
@@ -42,7 +45,7 @@
           url: https://github.com/ceph/cephmetrics.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           skip-tag: true
diff --git a/chacra-pull-requests/config/definitions/chacra-pull-requests.yml b/chacra-pull-requests/config/definitions/chacra-pull-requests.yml
index 02664fd6..aeb22256 100644
--- a/chacra-pull-requests/config/definitions/chacra-pull-requests.yml
+++ b/chacra-pull-requests/config/definitions/chacra-pull-requests.yml
@@ -5,7 +5,7 @@
           url: https://github.com/ceph/chacra
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           basedir: "chacra"
@@ -51,7 +51,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
diff --git a/merfi-pull-requests/config/definitions/merfi-pull-requests.yml b/merfi-pull-requests/config/definitions/merfi-pull-requests.yml
index 13808fd2..bd275e95 100644
--- a/merfi-pull-requests/config/definitions/merfi-pull-requests.yml
+++ b/merfi-pull-requests/config/definitions/merfi-pull-requests.yml
@@ -19,7 +19,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
@@ -51,7 +54,7 @@
           url: https://github.com/alfredodeza/merfi.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           skip-tag: true
diff --git a/radosgw-agent-pull-requests/config/definitions/radosgw-agent-pull-requests.yml b/radosgw-agent-pull-requests/config/definitions/radosgw-agent-pull-requests.yml
index a05311ab..38b35f5b 100644
--- a/radosgw-agent-pull-requests/config/definitions/radosgw-agent-pull-requests.yml
+++ b/radosgw-agent-pull-requests/config/definitions/radosgw-agent-pull-requests.yml
@@ -8,7 +8,7 @@
           url: https://github.com/ceph/radosgw-agent.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -49,7 +49,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
diff --git a/shaman-pull-requests/config/definitions/shaman-pull-requests.yml b/shaman-pull-requests/config/definitions/shaman-pull-requests.yml
index f416595d..75b31d27 100644
--- a/shaman-pull-requests/config/definitions/shaman-pull-requests.yml
+++ b/shaman-pull-requests/config/definitions/shaman-pull-requests.yml
@@ -5,7 +5,7 @@
           url: https://github.com/ceph/shaman
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           basedir: "shaman"
@@ -51,7 +51,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
diff --git a/teuthology-pull-requests/config/definitions/teuthology-pull-requests.yml b/teuthology-pull-requests/config/definitions/teuthology-pull-requests.yml
index 69c8c7de..aec59092 100644
--- a/teuthology-pull-requests/config/definitions/teuthology-pull-requests.yml
+++ b/teuthology-pull-requests/config/definitions/teuthology-pull-requests.yml
@@ -21,7 +21,10 @@
     parameters:
       - string:
           name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
+          description: "commit id or a refname, like 'origin/pr/72/head'"
+      - string:
+          name: ghprbPullId
+          description: "A pull request ID, like '72' in https://github.com/ceph/ceph/pull/72"
 
     triggers:
       - github-pull-request:
@@ -55,7 +58,7 @@
           url: https://github.com/ceph/teuthology.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
           browser: auto
           timeout: 20
           skip-tag: true