Exclude the jjb-test directory

When running jenkins-jobs we should exclude the jjb-test directory. That
way global-jjb can maintain tests in that directory while not affecting
users of global-jjb's tests jobs from picking up the tests.

Change-Id: I5101e4627291817d5cf9538f85a9f3db3e6d7b28
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/shell/jjb-merge-job.sh b/shell/jjb-merge-job.sh
index 090e915..8c54b62 100644 (file)
--- 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 jjb/
+jenkins-jobs update --recursive --delete-old --workers 4 --exclude jjb-test jjb

diff --git a/shell/jjb-verify-job.sh b/shell/jjb-verify-job.sh
index f38685f..789ffde 100644 (file)
--- 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 jjb/
+jenkins-jobs -l DEBUG test --recursive -o archives/job-configs --exclude jjb-test 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