Feat!: Upgrade Jenkins-job-builder to 6x

[ci-management.git] / extras / bash / sandbox_test_functions.sh

diff --git a/extras/bash/sandbox_test_functions.sh b/extras/bash/sandbox_test_functions.sh
index 90736e9..ae37d3a 100644 (file)
--- a/extras/bash/sandbox_test_functions.sh
+++ b/extras/bash/sandbox_test_functions.sh
@@ -29,7 +29,7 @@
 
 jjb-sandbox-env()
 {
-    local jjb_version=${JJB_VERSION:-"4.1.0"}
+    local jjb_version=${JJB_VERSION:-"6.0.0"}
 
     if [ -z "$WS_ROOT" ] ; then
         echo "ERROR: WS_ROOT is not set!"
@@ -72,6 +72,7 @@ jjb-sandbox-env()
     rm -rf $VENV_DIR \
        && python3 -m venv $VENV_DIR \
        && source $VENV_DIR/bin/activate \
+       && pip3 install --upgrade pip \
        && pip3 install wheel \
        && pip3 install jenkins-job-builder==$jjb_version
 
@@ -131,7 +132,8 @@ get_gerrit_refspec() {
     local query="$(ssh -p 29418 gerrit.fd.io gerrit query status:merged project:$project branch:$branch limit:1 --format=JSON --current-patch-set | tr ',' '\n' | grep refs | cut -d'"' -f4)"
 
     if [ -z "$query" ] ; then
-        echo "ERROR: Invalid project ($1) or branch ($2)"
+        echo "ERROR: Invalid argument(s): branch ($1) project ($2)"
+        echo "Usage: $0 <branch> <project>"
     else
         echo "$query"
     fi