From 32020479d14ba59c702088a2c9b1079ab4c522e0 Mon Sep 17 00:00:00 2001
From: Ward Vandewege <ward@curii.com>
Date: Fri, 21 Aug 2020 20:02:58 -0400
Subject: [PATCH 1/1] No more tagging as 'latest' for our Docker arvados/jobs
 image

refs #16565

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>
---
 jenkins/run-deploy.sh | 37 ++++---------------------------------
 1 file changed, 4 insertions(+), 33 deletions(-)

diff --git a/jenkins/run-deploy.sh b/jenkins/run-deploy.sh
index 574e040..2701ffa 100755
--- a/jenkins/run-deploy.sh
+++ b/jenkins/run-deploy.sh
@@ -336,28 +336,14 @@ if [[ "$NODE" == "" ]]; then
 
     ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv-keepdocker |grep -qP "arvados/jobs +$VERSION "
     if [[ $? -eq 0 ]]; then
-      title "Found latest arvados/jobs Docker image, nothing to upload"
-      # Just in case it isn't yet, tag the image as latest
-      title "Tag arvados/jobs Docker image $VERSION as latest"
-      ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv-keepdocker --project-uuid=$DOCKER_IMAGES_PROJECT arvados/jobs latest
-      if [[ $? -ne 0 ]]; then
-        title "'arv-keepdocker' failed..."
-        exit 1
-      fi
+      title "Found arvados/jobs Docker image version $VERSION, nothing to upload"
     else
-      title "Installing latest arvados/jobs Docker image"
+      title "Installing arvados/jobs Docker image version $VERSION"
       ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv-keepdocker --pull --project-uuid=$DOCKER_IMAGES_PROJECT arvados/jobs $VERSION
       if [[ $? -ne 0 ]]; then
         title "'arv-keepdocker' failed..."
         exit 1
       fi
-      ## adding latest tag too  refs 9254
-      docker tag arvados/jobs:$VERSION arvados/jobs:latest
-      ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv-keepdocker --project-uuid=$DOCKER_IMAGES_PROJECT arvados/jobs latest
-      if [[ $? -ne 0 ]]; then
-        title "'arv-keepdocker' failed..."
-        exit 1
-      fi
     fi
   else
     VERSION=`ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 125" $SHELL_NODE_FOR_ARV_KEEPDOCKER apt-cache policy python3-arvados-cwl-runner|grep Candidate`
@@ -373,29 +359,14 @@ if [[ "$NODE" == "" ]]; then
     ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 125" $SHELL_NODE_FOR_ARV_KEEPDOCKER "ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv-keepdocker" |grep -qP "arvados/jobs +$VERSION "
 
     if [[ $? -eq 0 ]]; then
-      title "Found latest arvados/jobs Docker image, nothing to upload"
-      # Just in case it isn't yet, tag the image as latest
-      title "Tag arvados/jobs Docker image $VERSION as latest"
-      ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 125" $SHELL_NODE_FOR_ARV_KEEPDOCKER docker tag arvados/jobs:$VERSION arvados/jobs:latest
-      ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 125" $SHELL_NODE_FOR_ARV_KEEPDOCKER "ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv-keepdocker --project-uuid=$DOCKER_IMAGES_PROJECT arvados/jobs latest"
-      if [[ $? -ne 0 ]]; then
-        title "'arv-keepdocker' failed..."
-        exit 1
-      fi
+      title "Found arvados/jobs Docker image version $VERSION, nothing to upload"
     else
-      title "Installing latest arvados/jobs Docker image"
+      title "Installing arvados/jobs Docker image version $VERSION"
       ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 125" $SHELL_NODE_FOR_ARV_KEEPDOCKER "ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv-keepdocker --pull --project-uuid=$DOCKER_IMAGES_PROJECT arvados/jobs $VERSION"
       if [[ $? -ne 0 ]]; then
         title "'arv-keepdocker' failed..."
         exit 1
       fi
-      ## adding latest tag too  refs 9254
-      ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 125" $SHELL_NODE_FOR_ARV_KEEPDOCKER docker tag arvados/jobs:$VERSION arvados/jobs:latest
-      ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 125" $SHELL_NODE_FOR_ARV_KEEPDOCKER "ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv-keepdocker --project-uuid=$DOCKER_IMAGES_PROJECT arvados/jobs latest"
-      if [[ $? -ne 0 ]]; then
-        title "'arv-keepdocker' failed..."
-        exit 1
-      fi
     fi
   fi
 fi
-- 
2.30.2