Merge branch '10186-crunch2-slurm-partition' closes #10186

[arvados.git] / build / run-build-packages-python-and-ruby.sh

diff --git a/build/run-build-packages-python-and-ruby.sh b/build/run-build-packages-python-and-ruby.sh
index e7981e59672c3e62d28000d9e2a0c308e178d598..13aa687316a5bbcca681e3fb1e9b6f7f0c0c9022 100755 (executable)
--- a/build/run-build-packages-python-and-ruby.sh
+++ b/build/run-build-packages-python-and-ruby.sh
@@ -172,6 +172,12 @@ fi
 
 if [[ "$UPLOAD" != 0 ]]; then
 
+  if [[ $DEBUG > 0 ]]; then
+    EXTRA_UPLOAD_FLAGS=" --verbose"
+  else
+    EXTRA_UPLOAD_FLAGS=""
+  fi
+
   if [[ ! -e "$WORKSPACE/packages" ]]; then
     mkdir -p "$WORKSPACE/packages"
   fi
@@ -179,8 +185,8 @@ if [[ "$UPLOAD" != 0 ]]; then
   title "Start upload python packages"
   timer_reset
 
-  if [ "$GEM_BUILD_FAILURES" -eq 0 ]; then
-    /usr/local/arvados-dev/jenkins/run_upload_packages.py --workspace $WORKSPACE python
+  if [ "$PYTHON_BUILD_FAILURES" -eq 0 ]; then
+    /usr/local/arvados-dev/jenkins/run_upload_packages.py $EXTRA_UPLOAD_FLAGS --workspace $WORKSPACE python
   else
     echo "Skipping python packages upload, there were errors building the packages"
   fi
@@ -190,8 +196,8 @@ if [[ "$UPLOAD" != 0 ]]; then
   title "Start upload ruby gems"
   timer_reset
 
-  if [ "$PYTHON_BUILD_FAILURES" -eq 0 ]; then
-    /usr/local/arvados-dev/jenkins/run_upload_packages.py --workspace $WORKSPACE gems
+  if [ "$GEM_BUILD_FAILURES" -eq 0 ]; then
+    /usr/local/arvados-dev/jenkins/run_upload_packages.py $EXTRA_UPLOAD_FLAGS --workspace $WORKSPACE gems
   else
     echo "Skipping ruby gem upload, there were errors building the packages"
   fi