From 4c47edee502585d83b3b1f52a3eb611083383a73 Mon Sep 17 00:00:00 2001 From: Jeremy Phelps Date: Tue, 14 Nov 2017 14:44:21 -0600 Subject: [PATCH] Fix branch variable in github scm The branch variable should not be concatenated with refs/heads. GHPRB makes use of variables to put here. Change-Id: If2a5735cbd18e0404d05211163d5bb7a1e5a96b1 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 +- .jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder | 2 +- .jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet | 2 +- .../expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder | 2 +- .jjb-test/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 | 2 +- .jjb-test/expected-xml/github-maven-maven-javadoc-publish-master | 2 +- .jjb-test/expected-xml/github-maven-maven-javadoc-verify-master | 2 +- .jjb-test/expected-xml/github-maven-maven-release-master | 2 +- .../expected-xml/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 +- docs/jjb/lf-macros.rst | 4 ++++ jjb/lf-macros.yaml | 2 +- 19 files changed, 22 insertions(+), 18 deletions(-) diff --git a/.jjb-test/expected-xml/github-ciman-jjb-deploy-job b/.jjb-test/expected-xml/github-ciman-jjb-deploy-job index 4837417a..112b3d26 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 + master diff --git a/.jjb-test/expected-xml/github-ciman-jjb-merge b/.jjb-test/expected-xml/github-ciman-jjb-merge index 06aadffa..5685e853 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 + master diff --git a/.jjb-test/expected-xml/github-ciman-jjb-verify b/.jjb-test/expected-xml/github-ciman-jjb-verify index 01cae705..217a127e 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 + 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 eeacda3a..03b12b08 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 + 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 c194add0..020c9513 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 + 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 32bf4fba..6fd70d12 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 + 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 1fce814a..5c2c23ec 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 + master diff --git a/.jjb-test/expected-xml/github-ciman-packer-verify b/.jjb-test/expected-xml/github-ciman-packer-verify index d36b7620..e69dfc11 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 + master diff --git a/.jjb-test/expected-xml/github-maven-maven-clm-master b/.jjb-test/expected-xml/github-maven-maven-clm-master index 24a08cf2..a8fb4068 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 + 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 64819b2e..1aaa7459 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 + 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 59634f3b..ce8c135c 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 + master diff --git a/.jjb-test/expected-xml/github-maven-maven-release-master b/.jjb-test/expected-xml/github-maven-maven-release-master index 169f1ada..7eecd715 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 + 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 73d6b992..48913f03 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 + master diff --git a/.jjb-test/expected-xml/github-maven-sonar b/.jjb-test/expected-xml/github-maven-sonar index 440e1f91..6a5d1d94 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 + master diff --git a/.jjb-test/expected-xml/github-node-node-verify-master b/.jjb-test/expected-xml/github-node-node-verify-master index 65449dfb..5884aac1 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 + master diff --git a/.jjb-test/expected-xml/github-python-tox-verify-master b/.jjb-test/expected-xml/github-python-tox-verify-master index 99e353d5..c3c0feda 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 + master diff --git a/.jjb-test/expected-xml/github-rtd-rtd-verify-master b/.jjb-test/expected-xml/github-rtd-rtd-verify-master index 26f5a617..6a9119b9 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 + master diff --git a/docs/jjb/lf-macros.rst b/docs/jjb/lf-macros.rst index a3cdc90a..a5da00d3 100644 --- a/docs/jjb/lf-macros.rst +++ b/docs/jjb/lf-macros.rst @@ -207,6 +207,10 @@ lf-infra-github-scm Basic SCM configuration for GitHub based projects. +On the `branch` variable you can assign `$sha1` or `$ghprbActualCommit` +as the value. This will require that the job be triggered via +the GHPRB plugin and not manually. + Triggers ======== diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml index 8408b6c0..1167ca4e 100644 --- a/jjb/lf-macros.yaml +++ b/jjb/lf-macros.yaml @@ -392,7 +392,7 @@ url: '{url}' refspec: '{refspec}' branches: - - 'refs/heads/{branch}' + - '{branch}' skip-tag: true wipe-workspace: true submodule: -- 2.16.6