summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xci/02-deploybundle.sh7
-rwxr-xr-xci/deploy.sh9
-rwxr-xr-xci/nosdn/fetch-charms.sh5
-rwxr-xr-xci/odl/fetch-charms.sh5
-rwxr-xr-xci/onos/fetch-charms.sh5
-rwxr-xr-xci/opencontrail/fetch-charms.sh5
6 files changed, 23 insertions, 13 deletions
diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index d10f3be6..396f5ea9 100755
--- 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 9277e857..d4c30d9d 100755
--- 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 28e41d6d..93dd7e3e 100755
--- 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 d0fa9ba3..565d48ee 100755
--- 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 761c52d5..cfe4f14b 100755
--- 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 b6ca4250..7eb9bdfd 100755
--- 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