From bd303903ee1d12dd5618106b1dad1f7b0a41983a Mon Sep 17 00:00:00 2001 From: Jeremy Phelps Date: Tue, 14 Nov 2017 18:39:57 -0600 Subject: [PATCH] Fix branch on verify and merge jobs This fixes the branch parameter on verify and merge jobs to be refs/heads/{branch} and $sha1 respectively. Change-Id: I230e04fda467848c5e764c90bf9190416b72dac4 Signed-off-by: Jeremy Phelps --- .jjb-test/expected-xml/github-ciman-jjb-deploy-job | 2 +- .jjb-test/expected-xml/github-ciman-jjb-merge | 2 +- .jjb-test/expected-xml/github-ciman-jjb-verify | 2 +- .../expected-xml/github-ciman-packer-merge-centos-java-builder | 2 +- .../expected-xml/github-ciman-packer-merge-centos-mininet | 2 +- .../github-ciman-packer-merge-ubuntu1604-java-builder | 2 +- .../expected-xml/github-ciman-packer-merge-ubuntu1604-mininet | 2 +- .jjb-test/expected-xml/github-ciman-packer-verify | 2 +- .jjb-test/expected-xml/github-maven-maven-clm-master | 4 ++-- .../expected-xml/github-maven-maven-javadoc-verify-master | 2 +- .../github-maven-maven-verify-master-mvn33-openjdk8 | 2 +- .jjb-test/expected-xml/github-maven-sonar | 2 +- .jjb-test/expected-xml/github-node-node-verify-master | 2 +- .jjb-test/expected-xml/github-python-tox-verify-master | 2 +- .jjb-test/expected-xml/github-rtd-rtd-verify-master | 2 +- jjb/lf-ci-jobs.yaml | 10 +++++----- jjb/lf-maven-jobs.yaml | 10 +++++----- jjb/lf-node-jobs.yaml | 2 +- jjb/lf-python-jobs.yaml | 2 +- jjb/lf-rtd-jobs.yaml | 2 +- 20 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.jjb-test/expected-xml/github-ciman-jjb-deploy-job b/.jjb-test/expected-xml/github-ciman-jjb-deploy-job index 112b3d26..7059d0bf 100644 --- a/.jjb-test/expected-xml/github-ciman-jjb-deploy-job +++ b/.jjb-test/expected-xml/github-ciman-jjb-deploy-job @@ -83,7 +83,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. - master + $sha1 diff --git a/.jjb-test/expected-xml/github-ciman-jjb-merge b/.jjb-test/expected-xml/github-ciman-jjb-merge index 5685e853..06aadffa 100644 --- a/.jjb-test/expected-xml/github-ciman-jjb-merge +++ b/.jjb-test/expected-xml/github-ciman-jjb-merge @@ -88,7 +88,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. - master + refs/heads/master diff --git a/.jjb-test/expected-xml/github-ciman-jjb-verify b/.jjb-test/expected-xml/github-ciman-jjb-verify index 217a127e..0773fe1e 100644 --- a/.jjb-test/expected-xml/github-ciman-jjb-verify +++ b/.jjb-test/expected-xml/github-ciman-jjb-verify @@ -88,7 +88,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. - master + $sha1 diff --git a/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder index 03b12b08..eeacda3a 100644 --- a/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder +++ b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder @@ -88,7 +88,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. - master + refs/heads/master diff --git a/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet index 020c9513..c194add0 100644 --- a/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet +++ b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet @@ -88,7 +88,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. - master + refs/heads/master diff --git a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder index 6fd70d12..32bf4fba 100644 --- a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder +++ b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder @@ -88,7 +88,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. - master + refs/heads/master diff --git a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet index 5c2c23ec..1fce814a 100644 --- a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet +++ b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet @@ -88,7 +88,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. - master + refs/heads/master diff --git a/.jjb-test/expected-xml/github-ciman-packer-verify b/.jjb-test/expected-xml/github-ciman-packer-verify index e69dfc11..4775b6ec 100644 --- a/.jjb-test/expected-xml/github-ciman-packer-verify +++ b/.jjb-test/expected-xml/github-ciman-packer-verify @@ -88,7 +88,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. - master + $sha1 diff --git a/.jjb-test/expected-xml/github-maven-maven-clm-master b/.jjb-test/expected-xml/github-maven-maven-clm-master index a8fb4068..2ed8491f 100644 --- a/.jjb-test/expected-xml/github-maven-maven-clm-master +++ b/.jjb-test/expected-xml/github-maven-maven-clm-master @@ -110,14 +110,14 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. origin - +refs/pull/*:refs/remotes/origin/pr/* + git@github.com:example-org/releng/ciman test-credential - master + refs/heads/master diff --git a/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master b/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master index ce8c135c..dd08e642 100644 --- a/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master +++ b/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master @@ -117,7 +117,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. - master + $sha1 diff --git a/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8 b/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8 index 48913f03..1d0f5c06 100644 --- a/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8 +++ b/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8 @@ -117,7 +117,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. - master + $sha1 diff --git a/.jjb-test/expected-xml/github-maven-sonar b/.jjb-test/expected-xml/github-maven-sonar index 6a5d1d94..df31ee7e 100644 --- a/.jjb-test/expected-xml/github-maven-sonar +++ b/.jjb-test/expected-xml/github-maven-sonar @@ -117,7 +117,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. - master + $sha1 diff --git a/.jjb-test/expected-xml/github-node-node-verify-master b/.jjb-test/expected-xml/github-node-node-verify-master index 5884aac1..1f01c03a 100644 --- a/.jjb-test/expected-xml/github-node-node-verify-master +++ b/.jjb-test/expected-xml/github-node-node-verify-master @@ -93,7 +93,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. - master + $sha1 diff --git a/.jjb-test/expected-xml/github-python-tox-verify-master b/.jjb-test/expected-xml/github-python-tox-verify-master index c3c0feda..199e18c4 100644 --- a/.jjb-test/expected-xml/github-python-tox-verify-master +++ b/.jjb-test/expected-xml/github-python-tox-verify-master @@ -96,7 +96,7 @@ Example: docs,py2,py3 - master + $sha1 diff --git a/.jjb-test/expected-xml/github-rtd-rtd-verify-master b/.jjb-test/expected-xml/github-rtd-rtd-verify-master index 6a9119b9..d75ce034 100644 --- a/.jjb-test/expected-xml/github-rtd-rtd-verify-master +++ b/.jjb-test/expected-xml/github-rtd-rtd-verify-master @@ -83,7 +83,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. - master + $sha1 diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index 6f1784c1..0749529c 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -337,7 +337,7 @@ - lf-infra-github-scm: url: '{git-clone-url}{github-org}/{project}' refspec: '+refs/pull/*:refs/remotes/origin/pr/*' - branch: '{branch}' + branch: '$sha1' submodule-recursive: true choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -426,7 +426,7 @@ - lf-infra-github-scm: url: '{git-clone-url}{github-org}/{project}' refspec: '' - branch: '{branch}' + branch: 'refs/heads/{branch}' submodule-recursive: '{submodule-recursive}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -525,7 +525,7 @@ - lf-infra-github-scm: url: '{git-clone-url}{github-org}/{project}' refspec: '+refs/pull/*:refs/remotes/origin/pr/*' - branch: '{branch}' + branch: '$sha1' submodule-recursive: '{submodule-recursive}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -619,7 +619,7 @@ - lf-infra-github-scm: url: '{git-clone-url}{github-org}/{project}' refspec: '' - branch: '{branch}' + branch: 'refs/heads/{branch}' submodule-recursive: '{submodule-recursive}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -727,7 +727,7 @@ - lf-infra-github-scm: url: '{git-clone-url}{github-org}/{project}' refspec: '+refs/pull/*:refs/remotes/origin/pr/*' - branch: '{branch}' + branch: '$sha1' submodule-recursive: '{submodule-recursive}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml index 7758fb61..27d505db 100644 --- a/jjb/lf-maven-jobs.yaml +++ b/jjb/lf-maven-jobs.yaml @@ -165,8 +165,8 @@ scm: - lf-infra-github-scm: url: '{git-clone-url}{github-org}/{project}' - refspec: '+refs/pull/*:refs/remotes/origin/pr/*' - branch: '{branch}' + refspec: '' + branch: 'refs/heads/{branch}' submodule-recursive: '{submodule-recursive}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -378,7 +378,7 @@ - lf-infra-github-scm: url: '{git-clone-url}{github-org}/{project}' refspec: '+refs/pull/*:refs/remotes/origin/pr/*' - branch: '{branch}' + branch: '$sha1' submodule-recursive: '{submodule-recursive}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -618,7 +618,7 @@ - lf-infra-github-scm: url: '{git-clone-url}{github-org}/{project}' refspec: '+refs/pull/*:refs/remotes/origin/pr/*' - branch: '{branch}' + branch: '$sha1' submodule-recursive: '{submodule-recursive}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -740,7 +740,7 @@ - lf-infra-github-scm: url: '{git-clone-url}{github-org}/{project}' refspec: '+refs/pull/*:refs/remotes/origin/pr/*' - branch: '{branch}' + branch: '$sha1' submodule-recursive: '{submodule-recursive}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' diff --git a/jjb/lf-node-jobs.yaml b/jjb/lf-node-jobs.yaml index f992d34c..5375c81d 100644 --- a/jjb/lf-node-jobs.yaml +++ b/jjb/lf-node-jobs.yaml @@ -125,7 +125,7 @@ - lf-infra-github-scm: url: '{git-clone-url}{github-org}/{project}' refspec: '+refs/pull/*:refs/remotes/origin/pr/*' - branch: '{branch}' + branch: '$sha1' submodule-recursive: '{submodule-recursive}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml index c37fab32..4011822f 100644 --- a/jjb/lf-python-jobs.yaml +++ b/jjb/lf-python-jobs.yaml @@ -134,7 +134,7 @@ - lf-infra-github-scm: url: '{git-clone-url}{github-org}/{project}' refspec: '+refs/pull/*:refs/remotes/origin/pr/*' - branch: '{branch}' + branch: '$sha1' submodule-recursive: '{submodule-recursive}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml index 8f8ba5d7..20470be7 100644 --- a/jjb/lf-rtd-jobs.yaml +++ b/jjb/lf-rtd-jobs.yaml @@ -215,7 +215,7 @@ - lf-infra-github-scm: url: '{git-clone-url}{github-org}/{project}' refspec: '+refs/pull/*:refs/remotes/origin/pr/*' - branch: '{branch}' + branch: '$sha1' submodule-recursive: '{submodule-recursive}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' -- 2.16.6