From 16c95e3ff61446c5cac0e1e683f8c3c72e0ad553 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Wed, 20 Sep 2017 07:41:18 -0500 Subject: modfiied to adjust timings as it seems download the container image is slow like few kbps. Change-Id: I9bb8e0efea0fc23b76d24145b1e3b4f545473da1 Signed-off-by: Narinder Gupta --- ci/02-deploybundle.sh | 7 ++++--- ci/deploy.sh | 9 +++++---- ci/nosdn/fetch-charms.sh | 5 +---- ci/odl/fetch-charms.sh | 5 +---- ci/onos/fetch-charms.sh | 5 +---- ci/opencontrail/fetch-charms.sh | 5 +---- 6 files changed, 13 insertions(+), 23 deletions(-) diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh index 396f5ea9..d10f3be6 100755 --- a/ci/02-deploybundle.sh +++ b/ci/02-deploybundle.sh @@ -26,6 +26,7 @@ fi #check whether charms are still executing the code even juju-deployer says installed. check_status() { waitstatus=$1 + waittime=$2 retval=0 timeoutiter=0 @@ -33,7 +34,7 @@ check_status() { while [ $retval -eq 0 ]; do if juju status | grep -q $waitstatus; then echo -n '.' - if [ $timeoutiter -ge 180 ]; then + if [ $timeoutiter -ge $waittime ]; then echo 'timed out' retval=1 else @@ -150,8 +151,8 @@ pastebinit bundles.yaml || true # with JUJU 2.0 bundles has to be deployed only once. juju deploy bundles.yaml --debug -sleep 120 -check_status allocating +sleep 720 +check_status allocating 220 # need to revisit later if not needed we will remove the below. openfile_fix() { diff --git a/ci/deploy.sh b/ci/deploy.sh index d4c30d9d..9277e857 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -272,6 +272,7 @@ deploy() { #check whether charms are still executing the code even juju-deployer says installed. check_status() { waitstatus=$1 + waittime=$2 retval=0 timeoutiter=0 @@ -279,7 +280,7 @@ check_status() { while [ $retval -eq 0 ]; do if juju status | grep -q $waitstatus; then echo_info "Still waiting for $waitstatus units" - if [ $timeoutiter -ge 180 ]; then + if [ $timeoutiter -ge $waittime ]; then echo_error 'Timed out' retval=1 else @@ -309,7 +310,7 @@ fi echo_info "Deployment started" deploy -check_status executing +check_status executing 180 echo_info "Deployment finished" juju status --format=tabular @@ -343,8 +344,8 @@ if ([ $opnfvmodel == "openstack" ]); then elif ([ $opnfvmodel == "kubernetes" ]); then #Workarounf for master chanrm as it takes 5 minutes to run properly - check_status waiting - check_status executing + check_status waiting 50 + check_status executing 50 echo_info "Configuring Kubernetes deployment" ./k8.sh diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh index 93dd7e3e..28e41d6d 100755 --- a/ci/nosdn/fetch-charms.sh +++ b/ci/nosdn/fetch-charms.sh @@ -30,10 +30,7 @@ git clone -b stable/17.08 https://github.com/openstack/charm-nova-cloud-controll git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute git clone -b stable/17.08 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard git clone -b stable/17.08 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server -git clone -b stable/17.08 https://github.com/openstack/charm-heat.git $distro/heat -cd $distro/heat -git pull https://git.openstack.org/openstack/charm-heat refs/changes/19/504219/1 -cd ../../ +git clone https://github.com/openstack/charm-heat.git $distro/heat git clone -b stable/17.08 https://github.com/openstack/charm-lxd.git $distro/lxd git clone https://github.com/openbaton/juju-charm.git $distro/openbaton diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh index 565d48ee..d0fa9ba3 100755 --- a/ci/odl/fetch-charms.sh +++ b/ci/odl/fetch-charms.sh @@ -30,10 +30,7 @@ git clone -b stable/17.08 https://github.com/openstack/charm-nova-cloud-controll git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute git clone -b stable/17.08 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard git clone -b stable/17.08 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server -git clone -b stable/17.08 https://github.com/openstack/charm-heat.git $distro/heat -cd $distro/heat -git pull https://git.openstack.org/openstack/charm-heat refs/changes/19/504219/1 -cd ../../ +git clone https://github.com/openstack/charm-heat.git $distro/heat git clone -b stable/17.08 https://github.com/openstack/charm-lxd.git $distro/lxd git clone -b stable/17.08 https://github.com/openstack/charm-odl-controller.git $distro/odl-controller git clone -b stable/17.08 https://github.com/openstack/charm-neutron-api-odl.git $distro/neutron-api-odl diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh index cfe4f14b..761c52d5 100755 --- a/ci/onos/fetch-charms.sh +++ b/ci/onos/fetch-charms.sh @@ -31,10 +31,7 @@ git clone -b stable/17.08 https://github.com/openstack/charm-nova-cloud-controll git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute git clone -b stable/17.08 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard git clone -b stable/17.08 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server -git clone -b stable/17.08 https://github.com/openstack/charm-heat.git $distro/heat -cd $distro/heat -git pull https://git.openstack.org/openstack/charm-heat refs/changes/19/504219/1 -cd ../../ +git clone https://github.com/openstack/charm-heat.git $distro/heat git clone https://github.com/openstack/charm-lxd.git $distro/lxd git clone https://github.com/openbaton/juju-charm.git $distro/openbaton diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh index 7eb9bdfd..b6ca4250 100755 --- a/ci/opencontrail/fetch-charms.sh +++ b/ci/opencontrail/fetch-charms.sh @@ -30,10 +30,7 @@ git clone -b stable/17.08 https://github.com/openstack/charm-nova-cloud-controll git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute git clone -b stable/17.08 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard git clone -b stable/17.08 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server -git clone -b stable/17.08 https://github.com/openstack/charm-heat.git $distro/heat -cd $distro/heat -git pull https://git.openstack.org/openstack/charm-heat refs/changes/19/504219/1 -cd ../../ +git clone https://github.com/openstack/charm-heat.git $distro/heat git clone -b stable/17.08 https://github.com/openstack/charm-lxd.git $distro/lxd git clone https://github.com/openbaton/juju-charm.git $distro/openbaton -- cgit 1.2.3-korg