From cc3cc10eda95ee82a031381278c7c19c6ed6bb84 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Fri, 6 Nov 2015 15:08:47 -0700 Subject: [PATCH] use auto browser for Git SCMs Many jobs specified the githubweb browser and defined a specific URL to find the commits. Reduce the duplication and rely on the Jenkins Git plugin's ability to automatically construct the URLs to the SCM commits. --- .../config/definitions/ceph-build-pull-requests.yml | 3 +-- ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml | 3 +-- .../config/definitions/ceph-deploy-pull-requests.yml | 3 +-- ceph-deploy/config/definitions/ceph-deploy.yml | 3 +-- .../config/definitions/ceph-qa-suite-pull-requests.yml | 3 +-- ceph-tag/config/definitions/ceph-tag.yml | 2 +- jenkins-job-builder/config/definitions/jjb.yml | 3 +-- .../config/definitions/mariner-installer-pull-requests.yml | 3 +-- merfi-pull-requests/config/definitions/merfi-pull-requests.yml | 3 +-- .../config/definitions/radosgw-agent-pull-requests.yml | 3 +-- radosgw-agent/config/definitions/radosgw-agent.yml | 3 +-- .../config/definitions/takora-pull-requests.yml | 3 +-- teuthology-docs/config/definitions/teuthology-docs.yml | 3 +-- .../config/definitions/teuthology-pull-requests.yml | 3 +-- 14 files changed, 14 insertions(+), 27 deletions(-) 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 0554f1e4..49341517 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 @@ -44,8 +44,7 @@ branches: - ${sha1} refspec: +refs/pull/*:refs/remotes/origin/pr/* - browser: githubweb - browser-url: https://github.com/ceph/ceph-build + browser: auto timeout: 20 skip-tag: true wipe-workspace: false diff --git a/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml b/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml index 941804e2..20174a4a 100644 --- a/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml +++ b/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml @@ -27,8 +27,7 @@ url: https://github.com/ceph/ceph-deploy branches: - master - browser: githubweb - browser-url: https://github.com/ceph/ceph-deploy + browser: auto skip-tag: true timeout: 20 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 5db3618f..5872a8f2 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 @@ -9,8 +9,7 @@ branches: - ${sha1} refspec: +refs/pull/*:refs/remotes/origin/pr/* - browser: githubweb - browser-url: https://github.com/ceph/ceph-deploy + browser: auto timeout: 20 skip-tag: true wipe-workspace: false diff --git a/ceph-deploy/config/definitions/ceph-deploy.yml b/ceph-deploy/config/definitions/ceph-deploy.yml index 1889e3f0..275901cc 100644 --- a/ceph-deploy/config/definitions/ceph-deploy.yml +++ b/ceph-deploy/config/definitions/ceph-deploy.yml @@ -39,8 +39,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if url: https://github.com/ceph/ceph-deploy.git branches: - $BRANCH - browser: githubweb - browser-url: http://github.com/ceph/ceph-deploy.git + browser: auto skip-tag: true timeout: 20 wipe-workspace: 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 cd4372b5..fb0a7a75 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 @@ -53,8 +53,7 @@ branches: - ${sha1} refspec: +refs/pull/*:refs/remotes/origin/pr/* - browser: githubweb - browser-url: https://github.com/ceph/ceph-qa-suite + browser: auto timeout: 20 skip-tag: true wipe-workspace: false diff --git a/ceph-tag/config/definitions/ceph-tag.yml b/ceph-tag/config/definitions/ceph-tag.yml index 8fe822ee..f7205aaf 100644 --- a/ceph-tag/config/definitions/ceph-tag.yml +++ b/ceph-tag/config/definitions/ceph-tag.yml @@ -3,7 +3,7 @@ scm: - git: url: https://github.com/ceph/ceph-build.git - browser-url: https://github.com/ceph/ceph-build + browser: auto timeout: 20 skip-tag: true wipe-workspace: true diff --git a/jenkins-job-builder/config/definitions/jjb.yml b/jenkins-job-builder/config/definitions/jjb.yml index 6bdc27ac..6f07f74b 100644 --- a/jenkins-job-builder/config/definitions/jjb.yml +++ b/jenkins-job-builder/config/definitions/jjb.yml @@ -27,8 +27,7 @@ url: https://github.com/ceph/ceph-build branches: - master - browser: githubweb - browser-url: https://github.com/ceph/ceph-build + browser: auto timeout: 20 builders: diff --git a/mariner-installer-pull-requests/config/definitions/mariner-installer-pull-requests.yml b/mariner-installer-pull-requests/config/definitions/mariner-installer-pull-requests.yml index 3805279a..a6abd743 100644 --- a/mariner-installer-pull-requests/config/definitions/mariner-installer-pull-requests.yml +++ b/mariner-installer-pull-requests/config/definitions/mariner-installer-pull-requests.yml @@ -32,8 +32,7 @@ branches: - ${sha1} refspec: +refs/pull/*:refs/remotes/origin/pr/* - browser: githubweb - browser-url: https://github.com/ceph/mariner-installer + browser: auto timeout: 20 skip-tag: true wipe-workspace: true diff --git a/merfi-pull-requests/config/definitions/merfi-pull-requests.yml b/merfi-pull-requests/config/definitions/merfi-pull-requests.yml index d123e600..40d03bd5 100644 --- a/merfi-pull-requests/config/definitions/merfi-pull-requests.yml +++ b/merfi-pull-requests/config/definitions/merfi-pull-requests.yml @@ -56,8 +56,7 @@ branches: - ${sha1} refspec: +refs/pull/*:refs/remotes/origin/pr/* - browser: githubweb - browser-url: https://github.com/alfredodeza/merfi + browser: auto timeout: 20 skip-tag: true wipe-workspace: 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 a72f713b..b41ab73e 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 @@ -43,8 +43,7 @@ branches: - ${sha1} refspec: +refs/pull/*:refs/remotes/origin/pr/* - browser: githubweb - browser-url: https://github.com/ceph/radosgw-agent + browser: auto timeout: 20 skip-tag: true wipe-workspace: false diff --git a/radosgw-agent/config/definitions/radosgw-agent.yml b/radosgw-agent/config/definitions/radosgw-agent.yml index 16bf08ba..b015cde0 100644 --- a/radosgw-agent/config/definitions/radosgw-agent.yml +++ b/radosgw-agent/config/definitions/radosgw-agent.yml @@ -26,8 +26,7 @@ url: https://github.com/ceph/radosgw-agent.git branches: - $BRANCH - browser: githubweb - browser-url: http://github.com/ceph/radosgw-agent.git + browser: auto timeout: 20 axes: diff --git a/takora-pull-requests/config/definitions/takora-pull-requests.yml b/takora-pull-requests/config/definitions/takora-pull-requests.yml index e211d37d..ee0fcb65 100644 --- a/takora-pull-requests/config/definitions/takora-pull-requests.yml +++ b/takora-pull-requests/config/definitions/takora-pull-requests.yml @@ -32,8 +32,7 @@ branches: - ${sha1} refspec: +refs/pull/*:refs/remotes/origin/pr/* - browser: githubweb - browser-url: https://github.com/ceph/takora + browser: auto timeout: 20 skip-tag: true wipe-workspace: true diff --git a/teuthology-docs/config/definitions/teuthology-docs.yml b/teuthology-docs/config/definitions/teuthology-docs.yml index 6ab1dc76..b0a7fba6 100644 --- a/teuthology-docs/config/definitions/teuthology-docs.yml +++ b/teuthology-docs/config/definitions/teuthology-docs.yml @@ -27,8 +27,7 @@ url: https://github.com/ceph/teuthology.git branches: - master - browser: githubweb - browser-url: https://github.com/ceph/teuthology.git + browser: auto timeout: 20 builders: diff --git a/teuthology-pull-requests/config/definitions/teuthology-pull-requests.yml b/teuthology-pull-requests/config/definitions/teuthology-pull-requests.yml index d2b164a1..5045f21b 100644 --- a/teuthology-pull-requests/config/definitions/teuthology-pull-requests.yml +++ b/teuthology-pull-requests/config/definitions/teuthology-pull-requests.yml @@ -57,8 +57,7 @@ branches: - ${sha1} refspec: +refs/pull/*:refs/remotes/origin/pr/* - browser: githubweb - browser-url: https://github.com/ceph/teuthology + browser: auto timeout: 20 skip-tag: true wipe-workspace: true -- 2.39.5