From: Jeremy Phelps Date: Tue, 14 Nov 2017 16:11:03 +0000 (-0600) Subject: Add branches parameter to github scm macro X-Git-Tag: v0.12.0~2 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=dd452eb375a1bfc85a84fb9a7950879ea5fda926;p=releng%2Fglobal-jjb.git Add branches parameter to github scm macro Make sure that the github scm macro accepts branches as a configuration option like the gerrit version of the macro. Change-Id: Ife15943fa3fc094e20981f804f7036133d881f46 Signed-off-by: Jeremy Phelps --- diff --git a/.jjb-test/expected-xml/github-ciman-jjb-deploy-job b/.jjb-test/expected-xml/github-ciman-jjb-deploy-job index 40e9a485..4837417a 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'. - ** + refs/heads/master diff --git a/.jjb-test/expected-xml/github-ciman-jjb-merge b/.jjb-test/expected-xml/github-ciman-jjb-merge index 0f839da3..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'. - ** + refs/heads/master diff --git a/.jjb-test/expected-xml/github-ciman-jjb-verify b/.jjb-test/expected-xml/github-ciman-jjb-verify index 814174dc..01cae705 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'. - ** + refs/heads/master 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 145268d5..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'. - ** + 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 0ce69465..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'. - ** + 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 f4ed55c4..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'. - ** + 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 99a2cb7e..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'. - ** + refs/heads/master diff --git a/.jjb-test/expected-xml/github-ciman-packer-verify b/.jjb-test/expected-xml/github-ciman-packer-verify index e773bdfd..d36b7620 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'. - ** + refs/heads/master diff --git a/.jjb-test/expected-xml/github-maven-maven-clm-master b/.jjb-test/expected-xml/github-maven-maven-clm-master index 239cda23..24a08cf2 100644 --- a/.jjb-test/expected-xml/github-maven-maven-clm-master +++ b/.jjb-test/expected-xml/github-maven-maven-clm-master @@ -117,7 +117,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. - ** + refs/heads/master diff --git a/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master b/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master index 5cb3cbe9..64819b2e 100644 --- a/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master +++ b/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master @@ -117,7 +117,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. - ** + 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 72318d2a..59634f3b 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'. - ** + refs/heads/master diff --git a/.jjb-test/expected-xml/github-maven-maven-release-master b/.jjb-test/expected-xml/github-maven-maven-release-master index 15e754eb..169f1ada 100644 --- a/.jjb-test/expected-xml/github-maven-maven-release-master +++ b/.jjb-test/expected-xml/github-maven-maven-release-master @@ -117,7 +117,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. - ** + refs/heads/master 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 3f4754f7..73d6b992 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'. - ** + refs/heads/master diff --git a/.jjb-test/expected-xml/github-maven-sonar b/.jjb-test/expected-xml/github-maven-sonar index 017819b1..440e1f91 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'. - ** + refs/heads/master diff --git a/.jjb-test/expected-xml/github-node-node-verify-master b/.jjb-test/expected-xml/github-node-node-verify-master index af297b2c..65449dfb 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'. - ** + refs/heads/master diff --git a/.jjb-test/expected-xml/github-python-tox-verify-master b/.jjb-test/expected-xml/github-python-tox-verify-master index 03e98934..99e353d5 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 - ** + refs/heads/master diff --git a/.jjb-test/expected-xml/github-rtd-rtd-verify-master b/.jjb-test/expected-xml/github-rtd-rtd-verify-master index 50af5e83..26f5a617 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'. - ** + refs/heads/master diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml index 5480f031..8408b6c0 100644 --- a/jjb/lf-macros.yaml +++ b/jjb/lf-macros.yaml @@ -391,6 +391,8 @@ credentials-id: '{jenkins-ssh-credential}' url: '{url}' refspec: '{refspec}' + branches: + - 'refs/heads/{branch}' skip-tag: true wipe-workspace: true submodule: