From 0ea33652f2dbed50a617fc62a80d1df9d56fb3ae Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Fri, 18 Aug 2017 14:56:32 -0400 Subject: [PATCH] Move tests to .jjb-test JJB by default ignores paths that start with '.' so take advantage of that and move our tests there. This way end users do not need to make any changes to their local environment to handle the new jjb-test directory. Change-Id: I9bd85a43d76cf1dfcb02e327f097cd6551366d1b Signed-off-by: Thanh Ha --- {jjb-test => .jjb-test}/defaults.yaml | 0 {jjb-test => .jjb-test}/expected-xml/gerrit-ciman-jjb-merge | 0 {jjb-test => .jjb-test}/expected-xml/gerrit-ciman-jjb-verify | 0 .../expected-xml/gerrit-ciman-packer-merge-centos-java-builder | 0 .../expected-xml/gerrit-ciman-packer-merge-centos-mininet | 0 .../expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder | 0 .../expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet | 0 {jjb-test => .jjb-test}/expected-xml/gerrit-ciman-packer-verify | 0 {jjb-test => .jjb-test}/expected-xml/gerrit-maven-maven-clm-master | 0 .../expected-xml/gerrit-maven-maven-release-master | 0 .../expected-xml/gerrit-maven-maven-verify-master-mvn33-openjdk8 | 0 {jjb-test => .jjb-test}/expected-xml/gerrit-python-tox-verify-master | 0 {jjb-test => .jjb-test}/expected-xml/github-ciman-jjb-merge | 0 {jjb-test => .jjb-test}/expected-xml/github-ciman-jjb-verify | 0 .../expected-xml/github-ciman-packer-merge-centos-java-builder | 0 .../expected-xml/github-ciman-packer-merge-centos-mininet | 0 .../expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder | 0 .../expected-xml/github-ciman-packer-merge-ubuntu1604-mininet | 0 {jjb-test => .jjb-test}/expected-xml/github-ciman-packer-verify | 0 {jjb-test => .jjb-test}/expected-xml/github-maven-maven-clm-master | 0 .../expected-xml/github-maven-maven-release-master | 0 .../expected-xml/github-maven-maven-verify-master-mvn33-openjdk8 | 0 {jjb-test => .jjb-test}/expected-xml/github-python-tox-verify-master | 0 {jjb-test => .jjb-test}/lf-ci-jobs.yaml | 0 {jjb-test => .jjb-test}/lf-maven-jobs.yaml | 0 {jjb-test => .jjb-test}/lf-python-jobs.yaml | 0 jjb-compare-xml.sh | 4 ++-- 27 files changed, 2 insertions(+), 2 deletions(-) rename {jjb-test => .jjb-test}/defaults.yaml (100%) rename {jjb-test => .jjb-test}/expected-xml/gerrit-ciman-jjb-merge (100%) rename {jjb-test => .jjb-test}/expected-xml/gerrit-ciman-jjb-verify (100%) rename {jjb-test => .jjb-test}/expected-xml/gerrit-ciman-packer-merge-centos-java-builder (100%) rename {jjb-test => .jjb-test}/expected-xml/gerrit-ciman-packer-merge-centos-mininet (100%) rename {jjb-test => .jjb-test}/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder (100%) rename {jjb-test => .jjb-test}/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet (100%) rename {jjb-test => .jjb-test}/expected-xml/gerrit-ciman-packer-verify (100%) rename {jjb-test => .jjb-test}/expected-xml/gerrit-maven-maven-clm-master (100%) rename {jjb-test => .jjb-test}/expected-xml/gerrit-maven-maven-release-master (100%) rename {jjb-test => .jjb-test}/expected-xml/gerrit-maven-maven-verify-master-mvn33-openjdk8 (100%) rename {jjb-test => .jjb-test}/expected-xml/gerrit-python-tox-verify-master (100%) rename {jjb-test => .jjb-test}/expected-xml/github-ciman-jjb-merge (100%) rename {jjb-test => .jjb-test}/expected-xml/github-ciman-jjb-verify (100%) rename {jjb-test => .jjb-test}/expected-xml/github-ciman-packer-merge-centos-java-builder (100%) rename {jjb-test => .jjb-test}/expected-xml/github-ciman-packer-merge-centos-mininet (100%) rename {jjb-test => .jjb-test}/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder (100%) rename {jjb-test => .jjb-test}/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet (100%) rename {jjb-test => .jjb-test}/expected-xml/github-ciman-packer-verify (100%) rename {jjb-test => .jjb-test}/expected-xml/github-maven-maven-clm-master (100%) rename {jjb-test => .jjb-test}/expected-xml/github-maven-maven-release-master (100%) rename {jjb-test => .jjb-test}/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8 (100%) rename {jjb-test => .jjb-test}/expected-xml/github-python-tox-verify-master (100%) rename {jjb-test => .jjb-test}/lf-ci-jobs.yaml (100%) rename {jjb-test => .jjb-test}/lf-maven-jobs.yaml (100%) rename {jjb-test => .jjb-test}/lf-python-jobs.yaml (100%) diff --git a/jjb-test/defaults.yaml b/.jjb-test/defaults.yaml similarity index 100% rename from jjb-test/defaults.yaml rename to .jjb-test/defaults.yaml diff --git a/jjb-test/expected-xml/gerrit-ciman-jjb-merge b/.jjb-test/expected-xml/gerrit-ciman-jjb-merge similarity index 100% rename from jjb-test/expected-xml/gerrit-ciman-jjb-merge rename to .jjb-test/expected-xml/gerrit-ciman-jjb-merge diff --git a/jjb-test/expected-xml/gerrit-ciman-jjb-verify b/.jjb-test/expected-xml/gerrit-ciman-jjb-verify similarity index 100% rename from jjb-test/expected-xml/gerrit-ciman-jjb-verify rename to .jjb-test/expected-xml/gerrit-ciman-jjb-verify 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 similarity index 100% rename from jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder rename to .jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder diff --git a/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet similarity index 100% rename from jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet rename to .jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet 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 similarity index 100% rename from jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder rename to .jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder diff --git a/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet similarity index 100% rename from jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet rename to .jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet diff --git a/jjb-test/expected-xml/gerrit-ciman-packer-verify b/.jjb-test/expected-xml/gerrit-ciman-packer-verify similarity index 100% rename from jjb-test/expected-xml/gerrit-ciman-packer-verify rename to .jjb-test/expected-xml/gerrit-ciman-packer-verify diff --git a/jjb-test/expected-xml/gerrit-maven-maven-clm-master b/.jjb-test/expected-xml/gerrit-maven-maven-clm-master similarity index 100% rename from jjb-test/expected-xml/gerrit-maven-maven-clm-master rename to .jjb-test/expected-xml/gerrit-maven-maven-clm-master diff --git a/jjb-test/expected-xml/gerrit-maven-maven-release-master b/.jjb-test/expected-xml/gerrit-maven-maven-release-master similarity index 100% rename from jjb-test/expected-xml/gerrit-maven-maven-release-master rename to .jjb-test/expected-xml/gerrit-maven-maven-release-master 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 similarity index 100% rename from jjb-test/expected-xml/gerrit-maven-maven-verify-master-mvn33-openjdk8 rename to .jjb-test/expected-xml/gerrit-maven-maven-verify-master-mvn33-openjdk8 diff --git a/jjb-test/expected-xml/gerrit-python-tox-verify-master b/.jjb-test/expected-xml/gerrit-python-tox-verify-master similarity index 100% rename from jjb-test/expected-xml/gerrit-python-tox-verify-master rename to .jjb-test/expected-xml/gerrit-python-tox-verify-master diff --git a/jjb-test/expected-xml/github-ciman-jjb-merge b/.jjb-test/expected-xml/github-ciman-jjb-merge similarity index 100% rename from jjb-test/expected-xml/github-ciman-jjb-merge rename to .jjb-test/expected-xml/github-ciman-jjb-merge diff --git a/jjb-test/expected-xml/github-ciman-jjb-verify b/.jjb-test/expected-xml/github-ciman-jjb-verify similarity index 100% rename from jjb-test/expected-xml/github-ciman-jjb-verify rename to .jjb-test/expected-xml/github-ciman-jjb-verify 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 similarity index 100% rename from jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder rename to .jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder diff --git a/jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet similarity index 100% rename from jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet rename to .jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet 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 similarity index 100% rename from jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder rename to .jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder diff --git a/jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet similarity index 100% rename from jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet rename to .jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet diff --git a/jjb-test/expected-xml/github-ciman-packer-verify b/.jjb-test/expected-xml/github-ciman-packer-verify similarity index 100% rename from jjb-test/expected-xml/github-ciman-packer-verify rename to .jjb-test/expected-xml/github-ciman-packer-verify diff --git a/jjb-test/expected-xml/github-maven-maven-clm-master b/.jjb-test/expected-xml/github-maven-maven-clm-master similarity index 100% rename from jjb-test/expected-xml/github-maven-maven-clm-master rename to .jjb-test/expected-xml/github-maven-maven-clm-master diff --git a/jjb-test/expected-xml/github-maven-maven-release-master b/.jjb-test/expected-xml/github-maven-maven-release-master similarity index 100% rename from jjb-test/expected-xml/github-maven-maven-release-master rename to .jjb-test/expected-xml/github-maven-maven-release-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 similarity index 100% rename from jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8 rename to .jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8 diff --git a/jjb-test/expected-xml/github-python-tox-verify-master b/.jjb-test/expected-xml/github-python-tox-verify-master similarity index 100% rename from jjb-test/expected-xml/github-python-tox-verify-master rename to .jjb-test/expected-xml/github-python-tox-verify-master diff --git a/jjb-test/lf-ci-jobs.yaml b/.jjb-test/lf-ci-jobs.yaml similarity index 100% rename from jjb-test/lf-ci-jobs.yaml rename to .jjb-test/lf-ci-jobs.yaml diff --git a/jjb-test/lf-maven-jobs.yaml b/.jjb-test/lf-maven-jobs.yaml similarity index 100% rename from jjb-test/lf-maven-jobs.yaml rename to .jjb-test/lf-maven-jobs.yaml diff --git a/jjb-test/lf-python-jobs.yaml b/.jjb-test/lf-python-jobs.yaml similarity index 100% rename from jjb-test/lf-python-jobs.yaml rename to .jjb-test/lf-python-jobs.yaml diff --git a/jjb-compare-xml.sh b/jjb-compare-xml.sh index 5017674b..d1ed43ca 100755 --- a/jjb-compare-xml.sh +++ b/jjb-compare-xml.sh @@ -13,12 +13,12 @@ test_dir=$(mktemp -d) script_dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -expected_xml_dir="$script_dir/jjb-test/expected-xml" +expected_xml_dir="$script_dir/.jjb-test/expected-xml" echo "Script Directory: $script_dir" echo "Test Directory: $test_dir" -jenkins-jobs test --recursive -o "$test_dir" "$script_dir" +jenkins-jobs test --recursive -o "$test_dir" "$script_dir":.jjb-test fail=false for xml in "$test_dir"/*; do -- 2.16.6