*/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 fe2fc4012591d151bab98485a407991953203342..592a7dec2ba5c9ca35a92c1a58b1f2fcde4002e2 100644 (file)
--- 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 452ec97f38ee563750608941265df51950671095..9e83909d94c3513b1ca82ce9e0c4a2654a1aa536 100644 (file)
--- 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 84a0db782df38d6729949e2260235ce6a4d86457..8aeac6d81cbd6e742fe0149b796f920c6100ccad 100644 (file)
--- 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 bb9af305fadcdac3648d42d7ca6a8cc83c70df55..17d1aa4d5e1b24e12807283f3d955a5311794167 100644 (file)
--- 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 58a3738f473d06f3e8591673a47c194363103547..0ba70307ff91bfce8cc87b96b47891c4177c126c 100644 (file)
--- 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 e4c6a1a79e5b77ac59720a8382a4e2e81a594793..445754e24aa2db24e61a3882da9dd79d5b0968be 100644 (file)
--- 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 99b638c45a12680b4e1e3f9f4ce10f64871e058d..002aedc6da045eefba7a8634def258450cbbe0a4 100644 (file)
--- 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 b71e7985b5509cd260b6279766e5cd200d90db3e..c4b761651b943ab18a63d0781a13f74a4203c2ef 100644 (file)
--- 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 6a18caf1cdd7c35cbbe6b246e2731efeaf150179..05524c86c72cc296bd05a4829bd581f9cbe791d9 100644 (file)
--- 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 24b0b51ca8ebbb2052bcc3ca0af392f3a61fe009..e9545981119e9c882c8364dcd3f0e90c1fab357f 100644 (file)
--- 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 64a2516451d7df28910639f1842b9beb2a5e1d6c..2c44a837099641391035f90bb5c5ce08ce4fc8b9 100644 (file)
--- 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 4e8801c214b6d36757dbc4cf378a386506d26fb7..5e3e57b6a7e9e817f8482068703f5f37d250a8cd 100644 (file)
--- 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 4f428a3824a7f074a031a9f218e1114aecc49c00..22c71a06b2abbc4428d751bb735beb1931dcb0c2 100644 (file)
--- 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 c9453160e2264a6c3c12164ac8910bf246a8ae0b..11501afde6830ceb1231029b32c9c4f5cab5c3d4 100644 (file)
--- 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 61c19def46a40bd4613a42ebe8b23c94abbe5d95..38759cea3a792b7abbe4ff74ff7cbd31e90c2585 100644 (file)
--- 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 2af2261b90890c94f8a581be7cf01c1fde9022fb..72132fd4f840d477be7b1488bbe5105f2998f093 100644 (file)
--- 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 e2892b631733f97e63a12ad4f4c362d25c762339..d7c0923d5c39480bca02fe3d49843f3886a18b93 100644 (file)
--- 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 d0a08300fae1c1d25091e5eed220a31a3d79f4a8..1cf300a3c176dc4f149fce23cd19019fbbc13e04 100644 (file)
--- 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 ea9af526fa1e9499a6e4e28596b273fe42b9d3d1..a857fff3068a689102233d70b6571b996c57798d 100644 (file)
--- 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 3c98a19a4a3bc3f487ecfb452b10e552282907af..bb04a851fad58f48d478a72fea8dcc1a1f85316c 100644 (file)
--- 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 6adcab919ff65ba8353daeead828a1dc459c193d..4c14df0af16c1fc3cc5996c05fe39dac2878dd14 100644 (file)
--- 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 333b1af0f9274b106e6ccaecaa33ec2ab530ef19..1be3e2f66ab24cf8cf0d9cc1a7d719a2b01b5d10 100644 (file)
--- 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 b2daa02e319c876aa90b3444758c28bf99117242..85c851e9fee49728833c04f7cb0bac2093a4c222 100644 (file)
--- 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 55ea2c352cc43902c26267f7a781b45f0661fd69..e3b1bc157a29ff35628bedb2e8f5e8951442794d 100644 (file)
--- 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 f1550cbe5e6018eab624cd22af14257e2d02e8b8..c1ae78815256cbed5171629305afa72907bae9da 100644 (file)
--- 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 126e10979c141e1772380c9a0f9e5f1d8167534e..956387cb5956aae24aa08fdafb103d142dec28c2 100644 (file)
--- 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 b3f7231b4aa528c5ff0f4be667abc059c1a7193b..37a0a5da61c71bec3b57cc3b5579a97101f23e07 100644 (file)
--- 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 02664fd6c99528c2be7f93a57d8cb1a09773041f..aeb2225692fdf25ef26524de7dc46d5c69ffe854 100644 (file)
--- 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 13808fd23838a1ca1f9383f7d70a1127d30602af..bd275e957dc300d2219fd42e62bddd1cd8124adf 100644 (file)
--- 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 a05311abd1309d7e990a9cb2783ed526f53f58d7..38b35f5bc77799b29c6b154c3f450d59ea24c6a7 100644 (file)
--- 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 f416595d82bea318be10af2dc3ef01d4d2b1499e..75b31d276b1a6b926d72f2f0f22ed0dc151f6019 100644 (file)
--- 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 69c8c7de137dba92f9e2ff2575f00eef7054819f..aec59092b107cf88783ebac2e40795989fe7ad9b 100644 (file)
--- 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