Merge "Auto Generated INFO.yaml file"

[joid.git] / ci / 02-deploybundle.sh

diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index 396f5ea..9473f32 100755 (executable)
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -12,9 +12,6 @@ opnfvfeature=$5
 opnfvdistro=$6
 opnfvmodel=$7
 
-jujuver=`juju --version`
-maasver=`apt-cache policy maas | grep Installed | cut -d ':' -f 2 | sed -e 's/ //'`
-
 if [[ "$opnfvmodel" = "openstack" ]]; then
     #copy and download charms
     ./$opnfvsdn/fetch-charms.sh $opnfvdistro
@@ -26,6 +23,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 +31,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
@@ -53,19 +51,10 @@ check_status() {
 PROFILE=maas
 MAAS_IP=$(grep " ip_address" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //')
 API_SERVERMAAS="http://$MAAS_IP:5240/MAAS/"
-if [[ "$maasver" > "2" ]]; then
-    API_KEY=`sudo maas-region apikey --username=ubuntu || true`
-else
-    API_KEY=`sudo maas-region-admin apikey --username=ubuntu || true`
-fi
-
+API_KEY=`sudo maas-region apikey --username=ubuntu || true`
 
 if [[ "$API_KEY" = "" ]]; then
-    if [[ "$maasver" > "2" ]]; then
-        API_KEY=`sshpass -p ubuntu ssh ubuntu@$MAAS_IP 'sudo maas-region apikey --username=ubuntu'`
-    else
-        API_KEY=`sshpass -p ubuntu ssh ubuntu@$MAAS_IP 'sudo maas-region-admin apikey --username=ubuntu'`
-    fi
+    API_KEY=`sshpass -p ubuntu ssh ubuntu@$MAAS_IP 'sudo maas-region apikey --username=ubuntu'`
 fi
 
 maas login $PROFILE $API_SERVERMAAS $API_KEY
@@ -74,16 +63,12 @@ if [[ "$opnfvmodel" = "openstack" ]]; then
     if [ -e ./deployconfig.yaml ]; then
        extport=`grep "ext-port" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //' | tr ',' ' '`
        datanet=`grep "dataNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
-       admnet=`grep "admNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
        cephdisk=`grep "ceph-disk" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
+       admnet=`grep "admNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
        osdomname=`grep "os-domain-name" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
     fi
 
-    if [[ "$maasver" > "2" ]]; then
-        workmutiple=`maas maas nodes read | grep "cpu_count" | cut -d ':' -f 2 | sed -e 's/ //' | tr ',' ' '`
-    else
-        workmutiple=`maas maas nodes list | grep "cpu_count" | cut -d ':' -f 2 | sed -e 's/ //' | tr ',' ' '`
-    fi
+    workmutiple=`maas maas nodes read | grep "cpu_count" | cut -d ':' -f 2 | sed -e 's/ //' | tr ',' ' '`
     max=0
     for v in ${workmutiple[@]}; do
         if (( $v > $max )); then max=$v; fi;
@@ -106,6 +91,8 @@ if [[ "$opnfvmodel" = "openstack" ]]; then
     else
         sed -i "s/cpu_pin_set: all/cpu_pin_set: 1/g" default_deployment_config.yaml
     fi
+else
+    cephdisk=`grep "ceph-disk" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
 fi
 
 case "$opnfvlab" in
@@ -150,8 +137,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() {
@@ -169,7 +156,7 @@ openfile_fix() {
 
 if [ "$opnfvsdn" = "ocl" ]
 then
-  TAG="ubuntu16.04-4.0.0.0-20.tar.gz"
+  TAG="ubuntu16.04-4.1.1.0-103.tar.gz"
 
   for ROLE in contrail-controller contrail-analytics contrail-analyticsdb
   do