From 43a8f1147f4fecd2a10a4dcc4c943da4f7c3be56 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Fri, 12 Jan 2018 16:56:34 -0500 Subject: [PATCH] Update expected xml to JJB 2.0 format Change-Id: I73ac8158a85559ec8d09682b8192aecb7f78ba8b Signed-off-by: Thanh Ha --- .../gerrit-ciman-gerrit-branch-lock-master | 14 ++++--------- .jjb-test/expected-xml/gerrit-ciman-jjb-deploy-job | 14 ++++--------- .jjb-test/expected-xml/gerrit-ciman-jjb-merge | 14 ++++--------- .jjb-test/expected-xml/gerrit-ciman-jjb-verify | 14 ++++--------- .../gerrit-ciman-packer-merge-centos-java-builder | 14 ++++--------- .../gerrit-ciman-packer-merge-centos-mininet | 14 ++++--------- ...rrit-ciman-packer-merge-ubuntu1604-java-builder | 14 ++++--------- .../gerrit-ciman-packer-merge-ubuntu1604-mininet | 14 ++++--------- .jjb-test/expected-xml/gerrit-ciman-packer-verify | 14 ++++--------- .../expected-xml/gerrit-maven-maven-clm-master | 14 ++++--------- .../gerrit-maven-maven-javadoc-publish-master | 14 ++++--------- .../gerrit-maven-maven-javadoc-verify-master | 14 ++++--------- .../expected-xml/gerrit-maven-maven-merge-master | 18 ++++++---------- .../expected-xml/gerrit-maven-maven-release-master | 14 ++++--------- ...t-maven-maven-verify-deps-master-mvn33-openjdk8 | 18 ++++++---------- ...gerrit-maven-maven-verify-master-mvn33-openjdk8 | 18 ++++++---------- .jjb-test/expected-xml/gerrit-maven-sonar | 18 ++++++---------- .../expected-xml/gerrit-node-node-verify-master | 14 ++++--------- .../expected-xml/gerrit-python-tox-verify-master | 14 ++++--------- .../expected-xml/gerrit-rtd-rtd-verify-master | 14 ++++--------- .jjb-test/expected-xml/github-ciman-jjb-deploy-job | 20 ++++++++---------- .jjb-test/expected-xml/github-ciman-jjb-merge | 20 ++++++++---------- .jjb-test/expected-xml/github-ciman-jjb-verify | 20 ++++++++---------- .../github-ciman-packer-merge-centos-java-builder | 20 ++++++++---------- .../github-ciman-packer-merge-centos-mininet | 20 ++++++++---------- ...thub-ciman-packer-merge-ubuntu1604-java-builder | 20 ++++++++---------- .../github-ciman-packer-merge-ubuntu1604-mininet | 20 ++++++++---------- .jjb-test/expected-xml/github-ciman-packer-verify | 20 ++++++++---------- .../expected-xml/github-maven-maven-clm-master | 20 ++++++++---------- .../github-maven-maven-javadoc-publish-master | 20 ++++++++---------- .../github-maven-maven-javadoc-verify-master | 20 ++++++++---------- .../expected-xml/github-maven-maven-merge-master | 24 ++++++++++------------ .../expected-xml/github-maven-maven-release-master | 20 ++++++++---------- ...github-maven-maven-verify-master-mvn33-openjdk8 | 24 ++++++++++------------ .jjb-test/expected-xml/github-maven-sonar | 24 ++++++++++------------ .../expected-xml/github-node-node-verify-master | 20 ++++++++---------- .../expected-xml/github-python-tox-verify-master | 20 ++++++++---------- .jjb-test/expected-xml/github-rtd-rtd-merge-master | 6 +++++- .../expected-xml/github-rtd-rtd-verify-master | 20 ++++++++---------- 39 files changed, 261 insertions(+), 413 deletions(-) diff --git a/.jjb-test/expected-xml/gerrit-ciman-gerrit-branch-lock-master b/.jjb-test/expected-xml/gerrit-ciman-gerrit-branch-lock-master index fbbca326..1c5b305c 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-gerrit-branch-lock-master +++ b/.jjb-test/expected-xml/gerrit-ciman-gerrit-branch-lock-master @@ -91,28 +91,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/master - - false - false - true - false false Default - - true - - false - false + + + false false false + false 10 diff --git a/.jjb-test/expected-xml/gerrit-ciman-jjb-deploy-job b/.jjb-test/expected-xml/gerrit-ciman-jjb-deploy-job index d1d1b4a6..1c335981 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-jjb-deploy-job +++ b/.jjb-test/expected-xml/gerrit-ciman-jjb-deploy-job @@ -91,28 +91,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/master - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 diff --git a/.jjb-test/expected-xml/gerrit-ciman-jjb-merge b/.jjb-test/expected-xml/gerrit-ciman-jjb-merge index 9cf95a34..be6ac423 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-jjb-merge +++ b/.jjb-test/expected-xml/gerrit-ciman-jjb-merge @@ -96,28 +96,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/master - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 diff --git a/.jjb-test/expected-xml/gerrit-ciman-jjb-verify b/.jjb-test/expected-xml/gerrit-ciman-jjb-verify index 9ad40b22..75f7dbc2 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-jjb-verify +++ b/.jjb-test/expected-xml/gerrit-ciman-jjb-verify @@ -96,28 +96,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/$GERRIT_BRANCH - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 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 b128bd5f..0e9facd8 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 @@ -96,28 +96,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/$GERRIT_BRANCH - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 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 ab2f528e..fa279e76 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet +++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet @@ -96,28 +96,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/$GERRIT_BRANCH - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 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 9a1fd38a..8896ec7a 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 @@ -96,28 +96,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/$GERRIT_BRANCH - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 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 16704055..6814aba4 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet +++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet @@ -96,28 +96,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/$GERRIT_BRANCH - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 diff --git a/.jjb-test/expected-xml/gerrit-ciman-packer-verify b/.jjb-test/expected-xml/gerrit-ciman-packer-verify index aaabb4c2..6e846d05 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-packer-verify +++ b/.jjb-test/expected-xml/gerrit-ciman-packer-verify @@ -96,28 +96,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/$GERRIT_BRANCH - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-clm-master b/.jjb-test/expected-xml/gerrit-maven-maven-clm-master index e0296668..94560692 100644 --- a/.jjb-test/expected-xml/gerrit-maven-maven-clm-master +++ b/.jjb-test/expected-xml/gerrit-maven-maven-clm-master @@ -125,28 +125,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/$GERRIT_BRANCH - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master b/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master index 6c3e0a1c..6281f823 100644 --- a/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master +++ b/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master @@ -125,28 +125,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/master - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master b/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master index d7f6d756..0f9e56bb 100644 --- a/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master +++ b/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master @@ -125,28 +125,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/$GERRIT_BRANCH - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-merge-master b/.jjb-test/expected-xml/gerrit-maven-maven-merge-master index 47b0ba8f..da858a5c 100644 --- a/.jjb-test/expected-xml/gerrit-maven-maven-merge-master +++ b/.jjb-test/expected-xml/gerrit-maven-maven-merge-master @@ -125,28 +125,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/$GERRIT_BRANCH - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -554,11 +548,11 @@ exit 0 false - + **/**.exec **/classes **/src/main/java - + false **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** 10 diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-release-master b/.jjb-test/expected-xml/gerrit-maven-maven-release-master index 58e56b1f..6db96c80 100644 --- a/.jjb-test/expected-xml/gerrit-maven-maven-release-master +++ b/.jjb-test/expected-xml/gerrit-maven-maven-release-master @@ -125,28 +125,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/$GERRIT_BRANCH - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 b/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 index 693b4a07..1db41869 100644 --- a/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 +++ b/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 @@ -125,28 +125,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/$GERRIT_BRANCH - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -472,11 +466,11 @@ exit 0 false - + **/**.exec **/classes **/src/main/java - + false **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** 10 diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-verify-master-mvn33-openjdk8 b/.jjb-test/expected-xml/gerrit-maven-maven-verify-master-mvn33-openjdk8 index 45f4d4af..b469e52b 100644 --- a/.jjb-test/expected-xml/gerrit-maven-maven-verify-master-mvn33-openjdk8 +++ b/.jjb-test/expected-xml/gerrit-maven-maven-verify-master-mvn33-openjdk8 @@ -125,28 +125,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/$GERRIT_BRANCH - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -429,11 +423,11 @@ exit 0 false - + **/**.exec **/classes **/src/main/java - + false **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** 10 diff --git a/.jjb-test/expected-xml/gerrit-maven-sonar b/.jjb-test/expected-xml/gerrit-maven-sonar index 8acf0492..98ae3baa 100644 --- a/.jjb-test/expected-xml/gerrit-maven-sonar +++ b/.jjb-test/expected-xml/gerrit-maven-sonar @@ -133,28 +133,22 @@ can call "org.codehaus.mojo:sonar-maven-plugin:3.3.0.603:sonar". refs/heads/$GERRIT_BRANCH - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -326,11 +320,11 @@ exit 0 - + **/**.exec **/classes **/src/main/java - + false **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** 10 diff --git a/.jjb-test/expected-xml/gerrit-node-node-verify-master b/.jjb-test/expected-xml/gerrit-node-node-verify-master index 5361e8c1..e9ebb3bf 100644 --- a/.jjb-test/expected-xml/gerrit-node-node-verify-master +++ b/.jjb-test/expected-xml/gerrit-node-node-verify-master @@ -101,28 +101,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/origin/$GERRIT_BRANCH - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 diff --git a/.jjb-test/expected-xml/gerrit-python-tox-verify-master b/.jjb-test/expected-xml/gerrit-python-tox-verify-master index 18976d10..7505dce0 100644 --- a/.jjb-test/expected-xml/gerrit-python-tox-verify-master +++ b/.jjb-test/expected-xml/gerrit-python-tox-verify-master @@ -104,28 +104,22 @@ Example: docs,py2,py3 refs/heads/$GERRIT_BRANCH - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 diff --git a/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master b/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master index b47f5e3d..b800fefc 100644 --- a/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master +++ b/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master @@ -91,28 +91,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/$GERRIT_BRANCH - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 diff --git a/.jjb-test/expected-xml/github-ciman-jjb-deploy-job b/.jjb-test/expected-xml/github-ciman-jjb-deploy-job index eacc7f00..984d3631 100644 --- a/.jjb-test/expected-xml/github-ciman-jjb-deploy-job +++ b/.jjb-test/expected-xml/github-ciman-jjb-deploy-job @@ -9,8 +9,9 @@ build-vm false - + $GIT_URL/$GERRIT_PROJECT/example-org/releng/ciman + @@ -86,28 +87,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. $sha1 - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -121,8 +116,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. false + + ^jjb-deploy (?!\*+$).+$ + true true true diff --git a/.jjb-test/expected-xml/github-ciman-jjb-merge b/.jjb-test/expected-xml/github-ciman-jjb-merge index 05a97f26..9e899d3c 100644 --- a/.jjb-test/expected-xml/github-ciman-jjb-merge +++ b/.jjb-test/expected-xml/github-ciman-jjb-merge @@ -9,8 +9,9 @@ build-vm false - + https://github.com/example-org/releng/ciman + @@ -91,28 +92,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/master - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -135,8 +130,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. tykeal zxiiro example-org + + ^remerge$ + true true false diff --git a/.jjb-test/expected-xml/github-ciman-jjb-verify b/.jjb-test/expected-xml/github-ciman-jjb-verify index 995d5054..63cf4bdc 100644 --- a/.jjb-test/expected-xml/github-ciman-jjb-verify +++ b/.jjb-test/expected-xml/github-ciman-jjb-verify @@ -9,8 +9,9 @@ build-vm false - + https://github.com/example-org/releng/ciman + @@ -91,28 +92,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. $sha1 - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -126,8 +121,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. false + + ^recheck$ + false true true 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 2d3a91e3..16b85577 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 @@ -9,8 +9,9 @@ build-vm false - + https://github.com/example-org/releng/ciman + @@ -91,28 +92,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/master - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -138,8 +133,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. tykeal zxiiro example-org + + ^remerge$ + true true false 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 648212d2..6ead30f2 100644 --- a/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet +++ b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet @@ -9,8 +9,9 @@ build-vm false - + https://github.com/example-org/releng/ciman + @@ -91,28 +92,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/master - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -138,8 +133,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. tykeal zxiiro example-org + + ^remerge$ + true true false 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 02cfae67..903976c6 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 @@ -9,8 +9,9 @@ build-vm false - + https://github.com/example-org/releng/ciman + @@ -91,28 +92,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/master - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -138,8 +133,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. tykeal zxiiro example-org + + ^remerge$ + true true false 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 324318b2..b3380b46 100644 --- a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet +++ b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet @@ -9,8 +9,9 @@ build-vm false - + https://github.com/example-org/releng/ciman + @@ -91,28 +92,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/master - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -138,8 +133,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. tykeal zxiiro example-org + + ^remerge$ + true true false diff --git a/.jjb-test/expected-xml/github-ciman-packer-verify b/.jjb-test/expected-xml/github-ciman-packer-verify index 272f913c..fd1dcb34 100644 --- a/.jjb-test/expected-xml/github-ciman-packer-verify +++ b/.jjb-test/expected-xml/github-ciman-packer-verify @@ -9,8 +9,9 @@ build-vm false - + https://github.com/example-org/releng/ciman + @@ -91,28 +92,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. $sha1 - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -126,8 +121,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. false + + ^recheck$ + false true true diff --git a/.jjb-test/expected-xml/github-maven-maven-clm-master b/.jjb-test/expected-xml/github-maven-maven-clm-master index ca73ec3d..1fa9c11f 100644 --- a/.jjb-test/expected-xml/github-maven-maven-clm-master +++ b/.jjb-test/expected-xml/github-maven-maven-clm-master @@ -10,8 +10,9 @@ build-vm false - + $GIT_URL/$PROJECT/example-org/releng/ciman + @@ -120,28 +121,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/master - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -155,8 +150,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. false + + ^run-clm$ + false true true 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 07cf871e..cceb368e 100644 --- a/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master +++ b/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master @@ -10,8 +10,9 @@ build-vm false - + $GIT_URL/$PROJECT/example-org/releng/ciman + @@ -120,28 +121,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. master - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -164,8 +159,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. tykeal zxiiro example-org + + ^remerge$ + true true false 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 6c573c6d..d9b3d895 100644 --- a/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master +++ b/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master @@ -10,8 +10,9 @@ build-vm false - + $GIT_URL/$PROJECT/example-org/releng/ciman + @@ -120,28 +121,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. $sha1 - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -155,8 +150,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. false + + ^recheck$ + true true true diff --git a/.jjb-test/expected-xml/github-maven-maven-merge-master b/.jjb-test/expected-xml/github-maven-maven-merge-master index 47cd9fdb..5fafbace 100644 --- a/.jjb-test/expected-xml/github-maven-maven-merge-master +++ b/.jjb-test/expected-xml/github-maven-maven-merge-master @@ -10,8 +10,9 @@ build-vm false - + $GIT_URL/$PROJECT/example-org/releng/ciman + @@ -120,28 +121,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. master - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -155,8 +150,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. false + + ^remerge$ + false true true @@ -512,11 +510,11 @@ exit 0 false - + **/**.exec **/classes **/src/main/java - + false **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** 10 diff --git a/.jjb-test/expected-xml/github-maven-maven-release-master b/.jjb-test/expected-xml/github-maven-maven-release-master index 4406105e..42487ad8 100644 --- a/.jjb-test/expected-xml/github-maven-maven-release-master +++ b/.jjb-test/expected-xml/github-maven-maven-release-master @@ -10,8 +10,9 @@ build-vm false - + $GIT_URL/$PROJECT/example-org/releng/ciman + @@ -120,28 +121,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. master - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -158,8 +153,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. false + + ^build release$ + true true true 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 1cc1c19e..33d083fb 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 @@ -10,8 +10,9 @@ build-vm false - + $GIT_URL/$PROJECT/example-org/releng/ciman + @@ -120,28 +121,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. $sha1 - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -155,8 +150,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. false + + ^recheck$ + false true true @@ -385,11 +383,11 @@ exit 0 false - + **/**.exec **/classes **/src/main/java - + false **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** 10 diff --git a/.jjb-test/expected-xml/github-maven-sonar b/.jjb-test/expected-xml/github-maven-sonar index 713ccb3a..c0c8c2a9 100644 --- a/.jjb-test/expected-xml/github-maven-sonar +++ b/.jjb-test/expected-xml/github-maven-sonar @@ -10,8 +10,9 @@ build-vm false - + $GIT_URL/$PROJECT/example-org/releng/ciman + @@ -128,28 +129,22 @@ can call "org.codehaus.mojo:sonar-maven-plugin:3.3.0.603:sonar". $sha1 - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -163,8 +158,11 @@ can call "org.codehaus.mojo:sonar-maven-plugin:3.3.0.603:sonar". false + + ^recheck$ + false true true @@ -291,11 +289,11 @@ exit 0 - + **/**.exec **/classes **/src/main/java - + false **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** 10 diff --git a/.jjb-test/expected-xml/github-node-node-verify-master b/.jjb-test/expected-xml/github-node-node-verify-master index bd9788c8..02d3563e 100644 --- a/.jjb-test/expected-xml/github-node-node-verify-master +++ b/.jjb-test/expected-xml/github-node-node-verify-master @@ -9,8 +9,9 @@ build-vm false - + $GIT_URL/$GERRIT_PROJECT/example-org/releng/ciman + @@ -96,28 +97,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. $sha1 - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -131,8 +126,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. false + + ^recheck$ + false true true diff --git a/.jjb-test/expected-xml/github-python-tox-verify-master b/.jjb-test/expected-xml/github-python-tox-verify-master index d499bbd1..cbdff165 100644 --- a/.jjb-test/expected-xml/github-python-tox-verify-master +++ b/.jjb-test/expected-xml/github-python-tox-verify-master @@ -9,8 +9,9 @@ build-vm false - + $GIT_URL/$GERRIT_PROJECT/example-org/releng/ciman + @@ -99,28 +100,22 @@ Example: docs,py2,py3 $sha1 - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -134,8 +129,11 @@ Example: docs,py2,py3 false + + ^recheck$ + false true true diff --git a/.jjb-test/expected-xml/github-rtd-rtd-merge-master b/.jjb-test/expected-xml/github-rtd-rtd-merge-master index c1dcaa91..943ab357 100644 --- a/.jjb-test/expected-xml/github-rtd-rtd-merge-master +++ b/.jjb-test/expected-xml/github-rtd-rtd-merge-master @@ -9,8 +9,9 @@ build-vm false - + https://github.com/example-org/releng/ciman + @@ -79,8 +80,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. false + + ^remerge$ + false true true diff --git a/.jjb-test/expected-xml/github-rtd-rtd-verify-master b/.jjb-test/expected-xml/github-rtd-rtd-verify-master index cf393fbd..bc03947e 100644 --- a/.jjb-test/expected-xml/github-rtd-rtd-verify-master +++ b/.jjb-test/expected-xml/github-rtd-rtd-verify-master @@ -9,8 +9,9 @@ build-vm false - + $GIT_URL/$PROJECT/example-org/releng/ciman + @@ -86,28 +87,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. $sha1 - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -121,8 +116,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. false + + ^recheck$ + false true true -- 2.16.6