Chore: Upgrade Jenkins-job-builder to 6.3.0

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

diff --git a/shell/jjb-merge-job.sh b/shell/jjb-merge-job.sh
index 4a8d23a..3b34fa8 100644 (file)
--- 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,7 +10,14 @@
 ##############################################################################
 echo "---> jjb-merge-job.sh"
 
+workers="${JJB_WORKERS:-0}"
+
 # Ensure we fail the job if any steps fail.
 set -eu -o pipefail
 
-jenkins-jobs update --recursive --delete-old --workers 4 jjb/
+# 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/