X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=tools%2Fdeploy_site.sh;h=f297cb96b755a01c3b29f2272dd658a594ce5cbb;hb=4c341d3fc54fec7b62269da3390fd0f5d8f779ce;hp=b60416511f15310f3daa3cf56c23893c54547e9c;hpb=96b1112e21fe903fdc0da5e06f324f9856f1a44d;p=yaml_builds.git

diff --git a/tools/deploy_site.sh b/tools/deploy_site.sh
index b604165..f297cb9 100755
--- a/tools/deploy_site.sh
+++ b/tools/deploy_site.sh
@@ -28,6 +28,8 @@ export OS_AUTH_URL=
 export OS_USERNAME=shipyard
 export OS_PASSWORD=
 REGION_NAME=
+MAAS_URL=
+AIRFLOW_URL=
 
 sleep 900
 
@@ -40,16 +42,23 @@ tools/airship shipyard create action deploy_site
 tools/airship shipyard get actions
 
 SHIPYARD_ACTION=$(tools/airship shipyard get actions | awk '/deploy_site/ {print $2};')
-
-tools/airship shipyard describe $SHIPYARD_ACTION
+SHIPYARD_CLI="tools/airship shipyard describe $SHIPYARD_ACTION"
 
 echo "## Airship deployment has been started..."
 echo "##"
 echo "## To monitor progress check:"
-echo "## MaaS GUI    -> http://{{yaml.genesis.host}}:30001/MAAS/#/nodes"
-echo "## Airflow GUI -> http://{{yaml.genesis.host}}:30004/admin/taskinstance/"
+echo "## MaaS GUI    -> $MAAS_URL"
+echo "## Shipyard cli-> $SHIPYARD_CLI"
+#echo "## Airflow GUI -> $AIRFLOW_URL"
+
+while ( ! $SHIPYARD_CLI | grep -qe '^Lifecycle.*Complete' && ! $SHIPYARD_CLI | grep -qe '^step.*failed' && ! $SHIPYARD_CLI | grep -qe '^Usage:' ); do
+  $SHIPYARD_CLI
+  echo "## Sleeping for 10 mins"
+  sleep 600
+done
+$SHIPYARD_CLI
 
 exec 2>&-
 exec 1>&-
-exit 0
-
+$SHIPYARD_CLI 2>&1 | grep -qPe 'failed|Usage:'
+exit $((! $?))