Fix: Pin setuptools in jjb-deploy-job.sh

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

diff --git a/shell/jjb-deploy-job.sh b/shell/jjb-deploy-job.sh
index 99ef367..f62b7df 100644 (file)
--- a/shell/jjb-deploy-job.sh
+++ b/shell/jjb-deploy-job.sh
@@ -14,10 +14,13 @@
 echo "---> jjb-deploy-job.sh"
 
 # Ensure we fail the job if any steps fail.
-set -e -o pipefail
+set -uef -o pipefail
 
-# shellcheck source=/tmp/v/jenkins-job-builder/bin/activate disable=SC1091
-source "/tmp/v/jenkins-job-builder/bin/activate"
+# shellcheck disable=SC1090
+source ~/lf-env.sh
+
+# Version controlled by JJB_VERSION
+lf-activate-venv --python python3 --venv-file /tmp/.jjb_venv jenkins-job-builder setuptools==65.7.0
 
 # Fetch patch if gerrit project matches the jjb-deploy project
 if [ "${GERRIT_PROJECT}" == "${PROJECT}" ]; then
@@ -35,4 +38,5 @@ if [ -z "${JOB_NAME//\*/}" ]; then
     exit 1
 fi
 
+echo "Deploying Job $JOB_NAME to sandbox"
 jenkins-jobs -s sandbox update --jobs-only --recursive --workers 4 jjb/ "$JOB_NAME"