run-deploy.sh improvements:

* make sure all arv-keepdocker calls include the project id.
* add some extra verbosity before arv-keepdocker call to tag the arvados/jobs image that exists

No issue #

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>

diff --git a/jenkins/run-deploy.sh b/jenkins/run-deploy.sh
index 2375530567513645092cf32c73c0fe5e661cf1d3..8da781db2b210f14b2bdf62290dfa1d8f685d7e8 100755 (executable)
--- a/jenkins/run-deploy.sh
+++ b/jenkins/run-deploy.sh
@@ -296,7 +296,8 @@ EOF
   if [[ "$?" == "0" ]]; then
     title "Found latest arvados/jobs Docker image, nothing to upload"
     # Just in case it isn't yet, tag the image as latest
-    ssh -o "StrictHostKeyChecking no" shell.$IDENTIFIER "ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv-keepdocker arvados/jobs latest"
+    title "Tag arvados/jobs Docker image $GIT_COMMIT as latest"
+    ssh -o "StrictHostKeyChecking no" shell.$IDENTIFIER "ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv-keepdocker --project-uuid=$DOCKER_IMAGES_PROJECT arvados/jobs latest"
   else
     title "Installing latest arvados/jobs Docker image"
     ssh -o "StrictHostKeyChecking no" shell.$IDENTIFIER "ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv-keepdocker --pull --project-uuid=$DOCKER_IMAGES_PROJECT arvados/jobs $GIT_COMMIT"