Revert "modfiied to adjust timings as it seems download the container image is slow...

This reverts commit 16c95e3ff61446c5cac0e1e683f8c3c72e0ad553.

Change-Id: I6bca3a73ff16f21d4f53dedf7523f9d14aca369f
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>

diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index d10f3be..396f5ea 100755 (executable)
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -26,7 +26,6 @@ fi
 #check whether charms are still executing the code even juju-deployer says installed.
 check_status() {
     waitstatus=$1
-    waittime=$2
     retval=0
     timeoutiter=0
 
@@ -34,7 +33,7 @@ check_status() {
     while [ $retval -eq 0 ]; do
         if juju status | grep -q $waitstatus; then
            echo -n '.'
-           if [ $timeoutiter -ge $waittime ]; then
+           if [ $timeoutiter -ge 180 ]; then
                echo 'timed out'
                retval=1
            else
@@ -151,8 +150,8 @@ pastebinit bundles.yaml || true
 
 # with JUJU 2.0 bundles has to be deployed only once.
 juju deploy bundles.yaml --debug
-sleep 720
-check_status allocating 220
+sleep 120
+check_status allocating
 
 # 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 9277e85..d4c30d9 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -272,7 +272,6 @@ deploy() {
 #check whether charms are still executing the code even juju-deployer says installed.
 check_status() {
     waitstatus=$1
-    waittime=$2
     retval=0
     timeoutiter=0
 
@@ -280,7 +279,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 $waittime ]; then
+           if [ $timeoutiter -ge 180 ]; then
                echo_error 'Timed out'
                retval=1
            else
@@ -310,7 +309,7 @@ fi
 echo_info "Deployment started"
 deploy
 
-check_status executing 180
+check_status executing
 
 echo_info "Deployment finished"
 juju status --format=tabular
@@ -344,8 +343,8 @@ if ([ $opnfvmodel == "openstack" ]); then
 
 elif ([ $opnfvmodel == "kubernetes" ]); then
    #Workarounf for master chanrm as it takes 5 minutes to run properly
-    check_status waiting 50
-    check_status executing 50
+    check_status waiting
+    check_status executing
     echo_info "Configuring Kubernetes deployment"
 
     ./k8.sh

diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index 28e41d6..93dd7e3 100755 (executable)
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/fetch-charms.sh
@@ -30,7 +30,10 @@ 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 https://github.com/openstack/charm-heat.git $distro/heat
+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 -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 d0fa9ba..565d48e 100755 (executable)
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -30,7 +30,10 @@ 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 https://github.com/openstack/charm-heat.git $distro/heat
+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 -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 761c52d..cfe4f14 100755 (executable)
--- a/ci/onos/fetch-charms.sh
+++ b/ci/onos/fetch-charms.sh
@@ -31,7 +31,10 @@ 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 https://github.com/openstack/charm-heat.git $distro/heat
+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-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 b6ca425..7eb9bdf 100755 (executable)
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -30,7 +30,10 @@ 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 https://github.com/openstack/charm-heat.git $distro/heat
+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 -b stable/17.08 https://github.com/openstack/charm-lxd.git $distro/lxd
 git clone https://github.com/openbaton/juju-charm.git $distro/openbaton