From 50a4c805f6ab0865f9f0c2e4600f5de0385c1550 Mon Sep 17 00:00:00 2001 From: kexkey Date: Fri, 28 Dec 2018 17:03:12 -0500 Subject: [PATCH] exitStatus mounting as dir, delays, are we ready? --- .../generators/app/templates/installer/start.sh | 10 ++++------ .../generators/app/templates/installer/testfeatures.sh | 4 +++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/install/generator-cyphernode/generators/app/templates/installer/start.sh b/install/generator-cyphernode/generators/app/templates/installer/start.sh index 670c2a3..8fed59f 100644 --- a/install/generator-cyphernode/generators/app/templates/installer/start.sh +++ b/install/generator-cyphernode/generators/app/templates/installer/start.sh @@ -23,22 +23,20 @@ docker-compose -f $current_path/docker-compose.yaml up -d --remove-orphans arch=$(uname -m) case "${arch}" in arm*) - printf "\r\n\033[1;31mSince we're on a slow RPi, let's give Docker 30 more seconds before performing our tests...\033[0m\r\n" - sleep 30 + printf "\r\n\033[1;31mSince we're on a slow RPi, let's give Docker 60 more seconds before performing our tests...\033[0m\r\n\r\n" + sleep 60 ;; esac -echo "EXIT_STATUS=1" > $current_path/exitStatus.sh - # Will test if Cyphernode is fully up and running... docker run --rm -it -v $current_path/testfeatures.sh:/testfeatures.sh \ -v <%= gatekeeper_datapath %>:/gatekeeper \ --v $current_path/exitStatus.sh:/exitStatus.sh \ +-v $current_path:/dist \ --network cyphernodenet alpine:3.8 /testfeatures.sh if [ -f $current_path/exitStatus.sh ]; then . $current_path/exitStatus.sh - rm $current_path/exitStatus.sh + rm -f $current_path/exitStatus.sh fi if [ "$EXIT_STATUS" -ne "0" ]; then diff --git a/install/generator-cyphernode/generators/app/templates/installer/testfeatures.sh b/install/generator-cyphernode/generators/app/templates/installer/testfeatures.sh index a7afff2..e9ef718 100644 --- a/install/generator-cyphernode/generators/app/templates/installer/testfeatures.sh +++ b/install/generator-cyphernode/generators/app/templates/installer/testfeatures.sh @@ -231,6 +231,8 @@ feature_status() { # Let's first see if everything is up. +echo "EXIT_STATUS=1" > /dist/exitStatus.sh + brokenproxy="false" containers=$(checkservice) returncode=$? @@ -320,4 +322,4 @@ echo "${result}" > /gatekeeper/installation.json echo -e "\r\n\e[1;32mTests finished.\e[0m" > /dev/console -echo "EXIT_STATUS=${finalreturncode}" > /exitStatus.sh +echo "EXIT_STATUS=${finalreturncode}" > /dist/exitStatus.sh