X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fjjb-merge-job.sh;h=3b34fa813338888a57a4b07e8c6b706fc280b94d;hb=04853ec1c27444d494afae28e8c181b711280f4b;hp=d3db19105a6c8ba236f1740a083ca438b7476214;hpb=851b0b6d0cfe84e986548fd596a9b2f18413fefd;p=releng%2Fglobal-jjb.git

diff --git a/shell/jjb-merge-job.sh b/shell/jjb-merge-job.sh
index d3db1910..3b34fa81 100644
--- a/shell/jjb-merge-job.sh
+++ b/shell/jjb-merge-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,4 +10,14 @@
 ##############################################################################
 echo "---> jjb-merge-job.sh"
 
-jenkins-jobs update --recursive --delete-old --workers 4 jjb/
+workers="${JJB_WORKERS:-0}"
+
+# Ensure we fail the job if any steps fail.
+set -eu -o pipefail
+
+# shellcheck disable=SC1090
+source ~/lf-env.sh
+
+lf-activate-venv jenkins-job-builder setuptools==65.7.0
+
+jenkins-jobs update --recursive --delete-old --workers "$workers" jjb/