Fix rtd merge job to handle new tag uploaded

[releng/global-jjb.git] / shell / jjb-verify-job.sh

diff --git a/shell/jjb-verify-job.sh b/shell/jjb-verify-job.sh
index bfa2622..8dd50f7 100644 (file)
--- a/shell/jjb-verify-job.sh
+++ b/shell/jjb-verify-job.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# @License EPL-1.0 <http://spdx.org/licenses/EPL-1.0>
+# SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
 #
@@ -10,7 +10,10 @@
 ##############################################################################
 echo "---> jjb-verify-job.sh"
 
-jenkins-jobs -l DEBUG test --recursive -o archives/job-configs jjb/
+# Ensure we fail the job if any steps fail.
+set -eu -o pipefail
+
+jenkins-jobs -l DEBUG test --recursive -o archives/job-configs --config-xml 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
@@ -18,11 +21,15 @@ jenkins-jobs -l DEBUG test --recursive -o archives/job-configs jjb/
 pushd archives/job-configs
 for letter in {a..z}
 do
-    ls "$letter"* > /dev/null 2>&1
-    if [[ "$?" -eq 0 ]]
+    if [[ $(ls "$letter"* > /dev/null 2>&1) -eq 0 ]]
     then
         mkdir "$letter"
-        find . -type f -maxdepth 1 -name "$letter*" -exec mv {} "$letter" \;
+        find . -maxdepth 1 -type f -name "$letter*" -exec mv {} "$letter" \;
     fi
 done
 popd
+
+if [ -n "$(ls -A archives/job-configs)" ]; then
+    tar cJvf archives/job-configs.tar.xz archives/job-configs
+    rm -rf archives/job-configs
+fi