From: Alfredo Deza <adeza@redhat.com>
Date: Thu, 12 Sep 2019 20:02:08 +0000 (-0400)
Subject: Revert "*/scm: only pull the PR under test"
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1394%2Fhead;p=ceph-build.git

Revert "*/scm: only pull the PR under test"

This reverts commit 4eae5698a6a1383c69338ec7781e4cee6c087a9f.

It breaks all pull-request jobs for ceph-volume at least, haven't been
able to investigate all other affected
---

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 592a7dec2..fe2fc4012 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,10 +20,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     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 9e83909d9..452ec97f3 100644
--- a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
+++ b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
@@ -20,10 +20,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     triggers:
       - github-pull-request:
@@ -927,7 +924,7 @@
           url: https://github.com/ceph/ceph-ansible.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           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 8aeac6d81..84a0db782 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/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -35,10 +35,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     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 17d1aa4d5..bb9af305f 100644
--- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
+++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
@@ -265,10 +265,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     triggers:
       - github-pull-request:
@@ -292,7 +289,7 @@
           url: https://github.com/ceph/ceph-ansible.git
           branches:
             - ${{sha1}}
-          refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           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 0ba70307f..58a3738f4 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/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           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 445754e24..e4c6a1a79 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,10 +21,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     triggers:
       - github-pull-request:
@@ -45,7 +42,7 @@
           url: https://github.com/ceph/ceph-build.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           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 002aedc6d..99b638c45 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/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -29,10 +29,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     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 c4b761651..b71e7985b 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/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -29,10 +29,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     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 05524c86c..6a18caf1c 100644
--- a/ceph-container-prs/config/definitions/ceph-container-prs.yml
+++ b/ceph-container-prs/config/definitions/ceph-container-prs.yml
@@ -35,10 +35,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     triggers:
       - github-pull-request:
@@ -62,7 +59,7 @@
           url: https://github.com/ceph/ceph-container.git
           branches:
             - ${{sha1}}
-          refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -110,10 +107,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     triggers:
       - github-pull-request:
@@ -137,7 +131,7 @@
           url: https://github.com/ceph/ceph-container.git
           branches:
             - ${{sha1}}
-          refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           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 e95459811..24b0b51ca 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,10 +23,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     triggers:
       - github-pull-request:
@@ -52,7 +49,7 @@
           url: https://github.com/ceph/ceph.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           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 2c44a8370..64a251645 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,10 +23,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     triggers:
       - github-pull-request:
@@ -53,7 +50,7 @@
           url: https://github.com/ceph/ceph.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           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 5e3e57b6a..4e8801c21 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/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -50,10 +50,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     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 22c71a06b..4f428a382 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/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -36,10 +36,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     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 11501afde..c9453160e 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/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -36,10 +36,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     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 38759cea3..61c19def4 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/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -36,10 +36,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     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 72132fd4f..2af2261b9 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/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
           basedir: "ceph-medic"
@@ -38,10 +38,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     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 d7c0923d5..e2892b631 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/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -47,10 +47,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     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 1cf300a3c..d0a08300f 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/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           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 a857fff30..ea9af526f 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/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           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 bb04a851f..3c98a19a4 100644
--- a/ceph-pr-submodules/config/definitions/ceph-pr-commits.yml
+++ b/ceph-pr-submodules/config/definitions/ceph-pr-commits.yml
@@ -20,10 +20,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     triggers:
       - github-pull-request:
@@ -45,7 +42,7 @@
           url: https://github.com/ceph/ceph.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           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 4c14df0af..6adcab919 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,12 +12,9 @@
     node: arm64
     parameters:
     - string:
-        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"
+        description: A pull request ID, like 'origin/pr/72/head'
+        name: sha1
     project-type: freestyle
     properties:
     - build-discarder:
@@ -49,7 +46,7 @@
           <userRemoteConfigs>
           <hudson.plugins.git.UserRemoteConfig>
           <name>origin</name>
-          <refspec>+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*</refspec>
+          <refspec>+refs/pull/*:refs/remotes/origin/pr/*</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 1be3e2f66..333b1af0f 100644
--- a/ceph-pull-requests/config/definitions/ceph-pull-requests.yml
+++ b/ceph-pull-requests/config/definitions/ceph-pull-requests.yml
@@ -23,10 +23,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     triggers:
       - github-pull-request:
@@ -49,7 +46,7 @@
           url: https://github.com/ceph/ceph.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           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 85c851e9f..b2daa02e3 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,10 +21,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     triggers:
       - github-pull-request:
@@ -53,7 +50,7 @@
           url: https://github.com/ceph/ceph-qa-suite.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           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 e3b1bc157..55ea2c352 100644
--- a/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml
+++ b/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml
@@ -89,10 +89,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
       # 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
@@ -131,7 +128,7 @@
           url: https://github.com/ceph/ceph.git
           branches:
             - ${{sha1}}
-          refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           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 c1ae78815..f1550cbe5 100644
--- a/ceph-volume-pr/config/definitions/ceph-volume-pr.yml
+++ b/ceph-volume-pr/config/definitions/ceph-volume-pr.yml
@@ -17,10 +17,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
       # 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
@@ -56,7 +53,7 @@
           browser: auto
           branches:
             - ${sha1}
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           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 956387cb5..126e10979 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/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           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 37a0a5da6..b3f7231b4 100644
--- a/cephmetrics-pull-requests/config/definitions/cephmetrics-pull-requests.yml
+++ b/cephmetrics-pull-requests/config/definitions/cephmetrics-pull-requests.yml
@@ -21,10 +21,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     triggers:
       - github-pull-request:
@@ -45,7 +42,7 @@
           url: https://github.com/ceph/cephmetrics.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           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 aeb222569..02664fd6c 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/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
           basedir: "chacra"
@@ -51,10 +51,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     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 bd275e957..13808fd23 100644
--- a/merfi-pull-requests/config/definitions/merfi-pull-requests.yml
+++ b/merfi-pull-requests/config/definitions/merfi-pull-requests.yml
@@ -19,10 +19,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     triggers:
       - github-pull-request:
@@ -54,7 +51,7 @@
           url: https://github.com/alfredodeza/merfi.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           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 38b35f5bc..a05311abd 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/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -49,10 +49,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     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 75b31d276..f416595d8 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/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
           basedir: "shaman"
@@ -51,10 +51,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     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 aec59092b..69c8c7de1 100644
--- a/teuthology-pull-requests/config/definitions/teuthology-pull-requests.yml
+++ b/teuthology-pull-requests/config/definitions/teuthology-pull-requests.yml
@@ -21,10 +21,7 @@
     parameters:
       - string:
           name: sha1
-          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"
+          description: "A pull request ID, like 'origin/pr/72/head'"
 
     triggers:
       - github-pull-request:
@@ -58,7 +55,7 @@
           url: https://github.com/ceph/teuthology.git
           branches:
             - ${sha1}
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
           skip-tag: true