[ARVADOS-DEV] updated: 6086e2a55293b8a21883f720788d951c3545cac6
git at public.curoverse.com
git at public.curoverse.com
Tue Jul 7 22:05:34 EDT 2015
Summary of changes:
jenkins/run-deploy.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
via 6086e2a55293b8a21883f720788d951c3545cac6 (commit)
from 0a139ea3b0b4dd9785ce1c847e08d507a9f1bb6d (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 6086e2a55293b8a21883f720788d951c3545cac6
Author: Ward Vandewege <ward at curoverse.com>
Date: Tue Jul 7 22:05:01 2015 -0400
Small fixes for run-deploy.sh
refs #6096
diff --git a/jenkins/run-deploy.sh b/jenkins/run-deploy.sh
index d5b6de0..98e4359 100755
--- a/jenkins/run-deploy.sh
+++ b/jenkins/run-deploy.sh
@@ -155,7 +155,7 @@ if [[ "$DOCKER_IMAGES_PROJECT" == "" ]]; then
fi
title "Found Arvados Standard Docker Images project with uuid $DOCKER_IMAGES_PROJECT"
-GIT_COMMIT=`ssh $IDENTIFIER cat /usr/local/arvados/src/git-commit.version`
+GIT_COMMIT=`ssh -o "StrictHostKeyChecking no" $IDENTIFIER cat /usr/local/arvados/src/git-commit.version`
if [[ "$?" != "0" ]] || [[ "$GIT_COMMIT" == "" ]]; then
title "ERROR: unable to get arvados/jobs Docker image git revision"
@@ -164,13 +164,13 @@ else
title "Found git commit for arvados/jobs Docker image: $GIT_COMMIT"
fi
-run_command shell.$IDENTIFIER ECODE "/usr/local/rvm/bin/rvm-exec default arv keep docker" |grep -q $GIT_COMMIT
+run_command shell.$IDENTIFIER ECODE "ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN /usr/local/rvm/bin/rvm-exec default arv keep docker" |grep -q $GIT_COMMIT
if [[ "$?" == "0" ]]; then
title "Found latest arvados/jobs Docker image, nothing to upload"
else
title "Installing latest arvados/jobs Docker image"
- ssh shell.$IDENTIFIER "/usr/local/rvm/bin/rvm-exec default arv keep docker --pull --project-uuid=$DOCKER_IMAGES_PROJECT arvados/jobs $GIT_COMMIT"
+ ssh -o "StrictHostKeyChecking no" shell.$IDENTIFIER "ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN /usr/local/rvm/bin/rvm-exec default arv keep docker --pull --project-uuid=$DOCKER_IMAGES_PROJECT arvados/jobs $GIT_COMMIT"
fi
title "Gathering list of shell and Keep nodes"
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list