From: Thanh Ha Date: Fri, 18 Aug 2017 19:10:27 +0000 (-0400) Subject: Revert "Exclude the jjb-test directory" X-Git-Tag: v0.7.0~2 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F42%2F6042%2F2;p=releng%2Fglobal-jjb.git Revert "Exclude the jjb-test directory" No longer necessary due to I9bd85a43d76cf1dfcb02e327f097cd6551366d1b. This reverts commit 854da1e33dd03f1569d0766dbedda123dd5af4ea. Change-Id: Iba0569d8fb1931af6dbacbd0bec8fd03b5d4e775 Signed-off-by: Thanh Ha --- diff --git a/.jjb-test/expected-xml/gerrit-ciman-jjb-merge b/.jjb-test/expected-xml/gerrit-ciman-jjb-merge index 30e26bb1..acebb7c1 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-jjb-merge +++ b/.jjb-test/expected-xml/gerrit-ciman-jjb-merge @@ -238,7 +238,7 @@ echo "---> jjb-merge-job.sh" # Ensure we fail the job if any steps fail. set -eu -o pipefail -jenkins-jobs update --recursive --delete-old --workers 4 --exclude jjb-test jjb +jenkins-jobs update --recursive --delete-old --workers 4 jjb/ diff --git a/.jjb-test/expected-xml/gerrit-ciman-jjb-verify b/.jjb-test/expected-xml/gerrit-ciman-jjb-verify index 9d553821..9d9a12aa 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-jjb-verify +++ b/.jjb-test/expected-xml/gerrit-ciman-jjb-verify @@ -275,7 +275,7 @@ echo "---> jjb-verify-job.sh" # Ensure we fail the job if any steps fail. set -eu -o pipefail -jenkins-jobs -l DEBUG test --recursive -o archives/job-configs --exclude jjb-test jjb +jenkins-jobs -l DEBUG test --recursive -o archives/job-configs jjb/ # Sort job output into sub-directories. On large Jenkins systems that have # many jobs archiving so many files into the same directory makes NGINX return diff --git a/.jjb-test/expected-xml/github-ciman-jjb-merge b/.jjb-test/expected-xml/github-ciman-jjb-merge index 12a55551..1f6bbcbf 100644 --- a/.jjb-test/expected-xml/github-ciman-jjb-merge +++ b/.jjb-test/expected-xml/github-ciman-jjb-merge @@ -200,7 +200,7 @@ echo "---> jjb-merge-job.sh" # Ensure we fail the job if any steps fail. set -eu -o pipefail -jenkins-jobs update --recursive --delete-old --workers 4 --exclude jjb-test jjb +jenkins-jobs update --recursive --delete-old --workers 4 jjb/ diff --git a/.jjb-test/expected-xml/github-ciman-jjb-verify b/.jjb-test/expected-xml/github-ciman-jjb-verify index 0d8d5b2b..3a10bb80 100644 --- a/.jjb-test/expected-xml/github-ciman-jjb-verify +++ b/.jjb-test/expected-xml/github-ciman-jjb-verify @@ -223,7 +223,7 @@ echo "---> jjb-verify-job.sh" # Ensure we fail the job if any steps fail. set -eu -o pipefail -jenkins-jobs -l DEBUG test --recursive -o archives/job-configs --exclude jjb-test jjb +jenkins-jobs -l DEBUG test --recursive -o archives/job-configs jjb/ # Sort job output into sub-directories. On large Jenkins systems that have # many jobs archiving so many files into the same directory makes NGINX return diff --git a/shell/jjb-merge-job.sh b/shell/jjb-merge-job.sh index 8c54b623..090e9153 100644 --- a/shell/jjb-merge-job.sh +++ b/shell/jjb-merge-job.sh @@ -13,4 +13,4 @@ echo "---> jjb-merge-job.sh" # Ensure we fail the job if any steps fail. set -eu -o pipefail -jenkins-jobs update --recursive --delete-old --workers 4 --exclude jjb-test jjb +jenkins-jobs update --recursive --delete-old --workers 4 jjb/ diff --git a/shell/jjb-verify-job.sh b/shell/jjb-verify-job.sh index 789ffde2..f38685f2 100644 --- a/shell/jjb-verify-job.sh +++ b/shell/jjb-verify-job.sh @@ -13,7 +13,7 @@ echo "---> jjb-verify-job.sh" # Ensure we fail the job if any steps fail. set -eu -o pipefail -jenkins-jobs -l DEBUG test --recursive -o archives/job-configs --exclude jjb-test jjb +jenkins-jobs -l DEBUG test --recursive -o archives/job-configs jjb/ # Sort job output into sub-directories. On large Jenkins systems that have # many jobs archiving so many files into the same directory makes NGINX return