Avoid unnecessary download of Atomix bits for full releases

Change-Id: Ic85de970f0a2ad242b437310387b4e92d334b90b
This commit is contained in:
Jordan Halterman 2018-10-30 12:11:36 -07:00 committed by Ray Milkey
parent 874020de4d
commit 2e212e93b3
2 changed files with 6 additions and 5 deletions

View File

@ -26,8 +26,6 @@ _EOF_
[ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
. $ONOS_ROOT/tools/build/envDefaults
onos-check-bits
while getopts fnvm: o; do
case "$o" in
f) uninstall=true;;
@ -43,6 +41,8 @@ shift $OPC
node=${1:-$OCI}
remote=$ONOS_USER@$node
$(dirname $0)/atomix-push-bits $node
ssh -tt $remote "
[ -f $ATOMIX_INSTALL_DIR/bin/atomix-agent ] && echo \"Atomix is already installed\" && exit 1

View File

@ -41,13 +41,14 @@ SSH_OPTIONS=" -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
if [ ! -z "$ATOMIX_ROOT" ]; then
echo "Pushing to $node from $ATOMIX_ROOT"
ATOMIX_TAR=$ATOMIX_ROOT/dist/target/atomix.tar.gz
elif [ -e $ATOMIX_MAVEN ]; then
elif [ -e "$ATOMIX_MAVEN" ]; then
echo "Pushing to $node from $ATOMIX_MAVEN"
ATOMIX_TAR=$ATOMIX_MAVEN
else
echo "Pushing to $node from $ATOMIX_LOCAL"
rm -f $ATOMIX_LOCAL
wget -O $ATOMIX_LOCAL $ATOMIX_REMOTE
if [ ! -f "$ATOMIX_LOCAL" ]; then
wget -O $ATOMIX_LOCAL $ATOMIX_REMOTE
fi
ATOMIX_TAR=$ATOMIX_LOCAL
fi