From ec0a666af4481b21b82be836011d6c94bb04e098 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Fri, 11 Aug 2017 17:52:09 -0400 Subject: [PATCH] Add default refspec reference Missed this when we ported over the infra-parameters. Refspec should default to refs/heads/{branch} so that a manual run of a job will always work against the specified branch for verify jobs. Merge jobs ignore this by defining a blank refspec. Change-Id: I7d7323b85b61639eef0e1b4491d6ba94d934b714 Signed-off-by: Thanh Ha --- jjb-test/expected-xml/gerrit-ciman-jjb-merge | 2 +- jjb-test/expected-xml/gerrit-ciman-jjb-verify | 2 +- jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder | 2 +- jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet | 2 +- jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder | 2 +- jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet | 2 +- jjb-test/expected-xml/gerrit-ciman-packer-verify | 2 +- jjb-test/expected-xml/gerrit-maven-maven-clm-master | 2 +- jjb-test/expected-xml/gerrit-maven-maven-release-master | 2 +- jjb-test/expected-xml/gerrit-python-tox-verify-master | 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 +- jjb-test/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-release-master | 2 +- jjb-test/expected-xml/github-python-tox-verify-master | 2 +- jjb/lf-macros.yaml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/jjb-test/expected-xml/gerrit-ciman-jjb-merge b/jjb-test/expected-xml/gerrit-ciman-jjb-merge index 0cc8742c..93149c92 100644 --- a/jjb-test/expected-xml/gerrit-ciman-jjb-merge +++ b/jjb-test/expected-xml/gerrit-ciman-jjb-merge @@ -62,7 +62,7 @@ job is triggered by Gerrit. Note that Gerrit will override this parameter automatically if a job is triggered by Gerrit. - + refs/heads/master JJB_VERSION diff --git a/jjb-test/expected-xml/gerrit-ciman-jjb-verify b/jjb-test/expected-xml/gerrit-ciman-jjb-verify index 4c982804..61e2a613 100644 --- a/jjb-test/expected-xml/gerrit-ciman-jjb-verify +++ b/jjb-test/expected-xml/gerrit-ciman-jjb-verify @@ -62,7 +62,7 @@ job is triggered by Gerrit. Note that Gerrit will override this parameter automatically if a job is triggered by Gerrit. - + refs/heads/master JJB_VERSION diff --git a/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder b/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder index 730f5280..4fde5906 100644 --- a/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder +++ b/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder @@ -62,7 +62,7 @@ job is triggered by Gerrit. Note that Gerrit will override this parameter automatically if a job is triggered by Gerrit. - + refs/heads/master PACKER_VERSION diff --git a/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet b/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet index 367f17d8..771c62e9 100644 --- a/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet +++ b/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet @@ -62,7 +62,7 @@ job is triggered by Gerrit. Note that Gerrit will override this parameter automatically if a job is triggered by Gerrit. - + refs/heads/master PACKER_VERSION diff --git a/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder b/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder index 27466db0..17135603 100644 --- a/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder +++ b/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder @@ -62,7 +62,7 @@ job is triggered by Gerrit. Note that Gerrit will override this parameter automatically if a job is triggered by Gerrit. - + refs/heads/master PACKER_VERSION diff --git a/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet b/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet index a62d8776..62be790c 100644 --- a/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet +++ b/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet @@ -62,7 +62,7 @@ job is triggered by Gerrit. Note that Gerrit will override this parameter automatically if a job is triggered by Gerrit. - + refs/heads/master PACKER_VERSION diff --git a/jjb-test/expected-xml/gerrit-ciman-packer-verify b/jjb-test/expected-xml/gerrit-ciman-packer-verify index 8681cd84..51f67c04 100644 --- a/jjb-test/expected-xml/gerrit-ciman-packer-verify +++ b/jjb-test/expected-xml/gerrit-ciman-packer-verify @@ -62,7 +62,7 @@ job is triggered by Gerrit. Note that Gerrit will override this parameter automatically if a job is triggered by Gerrit. - + refs/heads/master PACKER_VERSION diff --git a/jjb-test/expected-xml/gerrit-maven-maven-clm-master b/jjb-test/expected-xml/gerrit-maven-maven-clm-master index 200df483..6786db91 100644 --- a/jjb-test/expected-xml/gerrit-maven-maven-clm-master +++ b/jjb-test/expected-xml/gerrit-maven-maven-clm-master @@ -63,7 +63,7 @@ job is triggered by Gerrit. Note that Gerrit will override this parameter automatically if a job is triggered by Gerrit. - + refs/heads/master MAVEN_OPTS diff --git a/jjb-test/expected-xml/gerrit-maven-maven-release-master b/jjb-test/expected-xml/gerrit-maven-maven-release-master index 5e0bba8f..dd9ddc3c 100644 --- a/jjb-test/expected-xml/gerrit-maven-maven-release-master +++ b/jjb-test/expected-xml/gerrit-maven-maven-release-master @@ -63,7 +63,7 @@ job is triggered by Gerrit. Note that Gerrit will override this parameter automatically if a job is triggered by Gerrit. - + refs/heads/master MAVEN_OPTS diff --git a/jjb-test/expected-xml/gerrit-python-tox-verify-master b/jjb-test/expected-xml/gerrit-python-tox-verify-master index 9e8ebf17..30fa7f18 100644 --- a/jjb-test/expected-xml/gerrit-python-tox-verify-master +++ b/jjb-test/expected-xml/gerrit-python-tox-verify-master @@ -62,7 +62,7 @@ job is triggered by Gerrit. Note that Gerrit will override this parameter automatically if a job is triggered by Gerrit. - + refs/heads/master TOX_DIR diff --git a/jjb-test/expected-xml/github-ciman-jjb-merge b/jjb-test/expected-xml/github-ciman-jjb-merge index ce75fbc3..ab6cdb5b 100644 --- a/jjb-test/expected-xml/github-ciman-jjb-merge +++ b/jjb-test/expected-xml/github-ciman-jjb-merge @@ -57,7 +57,7 @@ job is triggered by Gerrit. Note that Gerrit will override this parameter automatically if a job is triggered by Gerrit. - + refs/heads/master JJB_VERSION diff --git a/jjb-test/expected-xml/github-ciman-jjb-verify b/jjb-test/expected-xml/github-ciman-jjb-verify index dc8b94a7..1f0e9d5b 100644 --- a/jjb-test/expected-xml/github-ciman-jjb-verify +++ b/jjb-test/expected-xml/github-ciman-jjb-verify @@ -57,7 +57,7 @@ job is triggered by Gerrit. Note that Gerrit will override this parameter automatically if a job is triggered by Gerrit. - + refs/heads/master JJB_VERSION 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 699ac5d4..36755e61 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 @@ -57,7 +57,7 @@ job is triggered by Gerrit. Note that Gerrit will override this parameter automatically if a job is triggered by Gerrit. - + refs/heads/master PACKER_VERSION 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 64a5a7c0..44c9896a 100644 --- a/jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet +++ b/jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet @@ -57,7 +57,7 @@ job is triggered by Gerrit. Note that Gerrit will override this parameter automatically if a job is triggered by Gerrit. - + refs/heads/master PACKER_VERSION 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 719709ca..c8ff4420 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 @@ -57,7 +57,7 @@ job is triggered by Gerrit. Note that Gerrit will override this parameter automatically if a job is triggered by Gerrit. - + refs/heads/master PACKER_VERSION 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 cac1b63f..a48988a6 100644 --- a/jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet +++ b/jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet @@ -57,7 +57,7 @@ job is triggered by Gerrit. Note that Gerrit will override this parameter automatically if a job is triggered by Gerrit. - + refs/heads/master PACKER_VERSION diff --git a/jjb-test/expected-xml/github-ciman-packer-verify b/jjb-test/expected-xml/github-ciman-packer-verify index b46c68c9..5386b738 100644 --- a/jjb-test/expected-xml/github-ciman-packer-verify +++ b/jjb-test/expected-xml/github-ciman-packer-verify @@ -57,7 +57,7 @@ job is triggered by Gerrit. Note that Gerrit will override this parameter automatically if a job is triggered by Gerrit. - + refs/heads/master PACKER_VERSION diff --git a/jjb-test/expected-xml/github-maven-maven-clm-master b/jjb-test/expected-xml/github-maven-maven-clm-master index b9ac069c..414d3d40 100644 --- a/jjb-test/expected-xml/github-maven-maven-clm-master +++ b/jjb-test/expected-xml/github-maven-maven-clm-master @@ -58,7 +58,7 @@ job is triggered by Gerrit. Note that Gerrit will override this parameter automatically if a job is triggered by Gerrit. - + refs/heads/master MAVEN_OPTS diff --git a/jjb-test/expected-xml/github-maven-maven-release-master b/jjb-test/expected-xml/github-maven-maven-release-master index e669719a..9a415e25 100644 --- a/jjb-test/expected-xml/github-maven-maven-release-master +++ b/jjb-test/expected-xml/github-maven-maven-release-master @@ -58,7 +58,7 @@ job is triggered by Gerrit. Note that Gerrit will override this parameter automatically if a job is triggered by Gerrit. - + refs/heads/master MAVEN_OPTS diff --git a/jjb-test/expected-xml/github-python-tox-verify-master b/jjb-test/expected-xml/github-python-tox-verify-master index c18a8cd4..7a8a99be 100644 --- a/jjb-test/expected-xml/github-python-tox-verify-master +++ b/jjb-test/expected-xml/github-python-tox-verify-master @@ -57,7 +57,7 @@ job is triggered by Gerrit. Note that Gerrit will override this parameter automatically if a job is triggered by Gerrit. - + refs/heads/master TOX_DIR diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml index 10a332a7..eb25459e 100644 --- a/jjb/lf-macros.yaml +++ b/jjb/lf-macros.yaml @@ -266,7 +266,7 @@ job is triggered by Gerrit. - string: name: GERRIT_REFSPEC - default: '' + default: 'refs/heads/{branch}' description: | Parameter to identify a refspec when pulling from Gerrit. -- 2.16.6