[ARVADOS-DEV] updated: 6a767361889c56e82ee497707b318b595e58a250
Git user
git at public.arvados.org
Tue Oct 13 19:11:45 UTC 2020
Summary of changes:
jenkins/run-deploy-salt.sh | 9 +++++----
jenkins/run-deploy.sh | 19 ++++++++++---------
2 files changed, 15 insertions(+), 13 deletions(-)
via 6a767361889c56e82ee497707b318b595e58a250 (commit)
from 45af8739ea10b4a902dff88c731c82bab0febeb1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 6a767361889c56e82ee497707b318b595e58a250
Author: Ward Vandewege <ward at curii.com>
Date: Tue Oct 13 15:11:18 2020 -0400
Handle the fact that ~ is not a valid character in docker image tags,
apparently.
No issue #
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>
diff --git a/jenkins/run-deploy-salt.sh b/jenkins/run-deploy-salt.sh
index 75e5f11..bc52dc9 100755
--- a/jenkins/run-deploy-salt.sh
+++ b/jenkins/run-deploy-salt.sh
@@ -148,14 +148,15 @@ else
fi
set +e
-run_salt "shell.$IDENTIFIER" "'{\"ARVADOS_API_HOST\": \"$ARVADOS_API_HOST\", \"ARVADOS_API_TOKEN\": \"$ARVADOS_API_TOKEN\"}'" "arv-keepdocker" |grep -qP "arvados/jobs +$VERSION "
+ CLEAN_VERSION=`echo $VERSION |tr -d '~'`
+run_salt "shell.$IDENTIFIER" "'{\"ARVADOS_API_HOST\": \"$ARVADOS_API_HOST\", \"ARVADOS_API_TOKEN\": \"$ARVADOS_API_TOKEN\"}'" "arv-keepdocker" |grep -qP "arvados/jobs +$CLEAN_VERSION "
if [[ $? -eq 0 ]]; then
set -e
- title "Found arvados/jobs Docker image version $VERSION, nothing to upload"
+ title "Found arvados/jobs Docker image version $CLEAN_VERSION, nothing to upload"
else
set -e
- title "Installing arvados/jobs Docker image version $VERSION"
- run_salt "shell.$IDENTIFIER" "'{\"ARVADOS_API_HOST\": \"$ARVADOS_API_HOST\", \"ARVADOS_API_TOKEN\": \"$ARVADOS_API_TOKEN\"}'" "arv-keepdocker --pull --project-uuid=$DOCKER_IMAGES_PROJECT arvados/jobs $VERSION"
+ title "Installing arvados/jobs Docker image version $CLEAN_VERSION"
+ run_salt "shell.$IDENTIFIER" "'{\"ARVADOS_API_HOST\": \"$ARVADOS_API_HOST\", \"ARVADOS_API_TOKEN\": \"$ARVADOS_API_TOKEN\"}'" "arv-keepdocker --pull --project-uuid=$DOCKER_IMAGES_PROJECT arvados/jobs $CLEAN_VERSION"
if [[ $? -ne 0 ]]; then
title "'arv-keepdocker' failed..."
exit 1
diff --git a/jenkins/run-deploy.sh b/jenkins/run-deploy.sh
index 4717497..531010f 100755
--- a/jenkins/run-deploy.sh
+++ b/jenkins/run-deploy.sh
@@ -335,15 +335,15 @@ if [[ "$NODE" == "" ]]; then
fi
set +e
- ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv-keepdocker |grep -qP "arvados/jobs +$VERSION "
+ CLEAN_VERSION=`echo $VERSION |tr -d '~'`
+ ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv-keepdocker |grep -qP "arvados/jobs +$CLEAN_VERSION "
if [[ $? -eq 0 ]]; then
set -e
- title "Found arvados/jobs Docker image version $VERSION, nothing to upload"
+ title "Found arvados/jobs Docker image version $CLEAN_VERSION, nothing to upload"
else
set -e
- title "Found arvados/jobs Docker image version $VERSION, nothing to upload"
- 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
+ title "Installing arvados/jobs Docker image version $CLEAN_VERSION"
+ ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv-keepdocker --pull --project-uuid=$DOCKER_IMAGES_PROJECT arvados/jobs $CLEAN_VERSION
if [[ $? -ne 0 ]]; then
title "'arv-keepdocker' failed..."
exit 1
@@ -361,14 +361,15 @@ if [[ "$NODE" == "" ]]; then
fi
set +e
- ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 125" -o "LogLevel QUIET" $SHELL_NODE_FOR_ARV_KEEPDOCKER "ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv-keepdocker" |grep -qP "arvados/jobs +$VERSION "
+ CLEAN_VERSION=`echo $VERSION |tr -d '~'`
+ ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 125" -o "LogLevel QUIET" $SHELL_NODE_FOR_ARV_KEEPDOCKER "ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv-keepdocker" |grep -qP "arvados/jobs +$CLEAN_VERSION "
if [[ $? -eq 0 ]]; then
set -e
- title "Found arvados/jobs Docker image version $VERSION, nothing to upload"
+ title "Found arvados/jobs Docker image version $CLEAN_VERSION, nothing to upload"
else
set -e
- title "Installing arvados/jobs Docker image version $VERSION"
- ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 125" -o "LogLevel QUIET" $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"
+ title "Installing arvados/jobs Docker image version $CLEAN_VERSION"
+ ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 125" -o "LogLevel QUIET" $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 $CLEAN_VERSION"
if [[ $? -ne 0 ]]; then
title "'arv-keepdocker' failed..."
exit 1
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list