Add JOID project parameters and a final openstack test to check deploy result

[releng.git] / jjb / joid / joid-deploy.sh

diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index d9ce86e..c7e5ba8 100644 (file)
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -2,12 +2,8 @@
 set +e
 set -o nounset
 
-####### Temporary - to be done with jenkins params #####
-JOID_MODE=ha
-JOID_RELEASE=liberty
-JOID_LOCAL_CONFIG_FOLDER=~/joid_config
-JOID_SDN_CONTROLLER=odl
-#################
+JOID_LOCAL_CONFIG_FOLDER=$HOME/joid_config
+JOID_ADMIN_OPENRC=$JOID_LOCAL_CONFIG_FOLDER/admin-openrc
 
 ##
 ## Load local config or defaults
@@ -18,6 +14,7 @@ if [ -e "$JOID_LOCAL_CONFIG_FOLDER/config.sh" ]; then
     source $JOID_LOCAL_CONFIG_FOLDER/config.sh
 else
     echo "------ No local config, load default ------"
+    # link NODE_NAME to joid node config names
     case $NODE_NAME in
         orange-fr-pod2)
             POD=orange-pod2 ;;
@@ -33,7 +30,6 @@ else
     export OS_ADMIN_PASSWORD=openstack
     export CEPH_DISKS=/srv
     export CEPH_REFORMAT=no
-    export JOID_ADMIN_OPENRC=$WORKSPACE/admin_openrc.sh
 fi
 
 ##
@@ -47,8 +43,8 @@ if [ -e "$JOID_LOCAL_CONFIG_FOLDER/environments.yaml" ] && [ "$MAAS_REINSTALL" =
 else
     MAASCONFIG=$WORKSPACE/ci/maas/$POD_DC/$POD_NUM/deployment.yaml
     echo "------ Set MAAS password ------"
-    sed -i -- 's/user: ubuntu/user: $MAAS_USER/' $MAASCONFIG
-    sed -i -- 's/password: ubuntu/password: $MAAS_PASSWORD/' $MAASCONFIG
+    sed -i -- "s/user: ubuntu/user: $MAAS_USER/" $MAASCONFIG
+    sed -i -- "s/password: ubuntu/password: $MAAS_PASSWORD/" $MAASCONFIG
     echo "------ Redeploy MAAS ------"
     ./02-maasdeploy.sh $POD_NAME
 fi
@@ -58,10 +54,10 @@ fi
 ##
 
 # Get juju deployer file
-if [ "$JOID_MODE" == 'nonha' ]; then
-    SRCBUNDLE=$WORKSPACE/ci/$JOID_SDN_CONTROLLER/juju-deployer/ovs-$JOID_SDN_CONTROLLER.yaml
+if [ "$HA_MODE" == 'nonha' ]; then
+    SRCBUNDLE=$WORKSPACE/ci/$SDN_CONTROLLER/juju-deployer/ovs-$SDN_CONTROLLER.yaml
 else
-    SRCBUNDLE=$WORKSPACE/ci/$JOID_SDN_CONTROLLER/juju-deployer/ovs-$JOID_SDN_CONTROLLER-$JOID_MODE.yaml
+    SRCBUNDLE=$WORKSPACE/ci/$SDN_CONTROLLER/juju-deployer/ovs-$SDN_CONTROLLER-$HA_MODE.yaml
 fi
 
 # Modify files
@@ -78,17 +74,24 @@ sed -i -r -- "s/^(\s+osd-reformat: )'no'/\1'$CEPH_REFORMAT'/" $SRCBUNDLE
 ##
 
 echo "------ Deploy with juju ------"
-echo "Execute: ./deploy.sh -t $JOID_MODE -o $JOID_RELEASE -s $JOID_SDN_CONTROLLER -l $POD_NAME"
+echo "Execute: ./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME"
 
-./deploy.sh -t $JOID_MODE -o $JOID_RELEASE -s $JOID_SDN_CONTROLLER -l $POD_NAME
+./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME
 
 ##
 ## Set Admin RC
 ##
 
-echo "------ Create OpenRC file ------"
-KEYSTONE=$(cat bundle.yaml |shyaml get-value openstack-phase2.services.keystone.options.vip)
+echo "------ Create OpenRC file [$JOID_ADMIN_OPENRC] ------"
+KEYSTONE=$(cat bundles.yaml |shyaml get-value openstack-phase2.services.keystone.options.vip)
 
+# create the folder if needed
+JOID_ADMIN_OPENRC_FOLDER=$(echo $JOID_ADMIN_OPENRC | perl -pe "s|^(.*/).*?$|\1|")
+if [ ! -d "$JOID_ADMIN_OPENRC_FOLDER" ]; then
+    mkdir -p $JOID_ADMIN_OPENRC_FOLDER
+fi
+
+# export the openrc file
 cat << EOF > $JOID_ADMIN_OPENRC
 export OS_USERNAME=admin
 export OS_PASSWORD=$OS_ADMIN_PASSWORD
@@ -97,7 +100,37 @@ export OS_AUTH_URL=http://$KEYSTONE:5000/v2.0
 export OS_REGION_NAME=Canonical
 EOF
 
+##
+## Backup local juju env
+##
+
 if [ -d "$JOID_LOCAL_CONFIG_FOLDER" ]; then
     echo "------ Backup Juju environment ------"
     cp environments.yaml $JOID_LOCAL_CONFIG_FOLDER/
 fi
+
+##
+## Basic test to return a realistic result to jenkins
+##
+source $JOID_ADMIN_OPENRC
+curl -i -sw '%{http_code}' -H "Content-Type: application/json"   -d "
+{ \"auth\": {
+    \"identity\": {
+      \"methods\": [\"password\"],
+      \"password\": {
+        \"user\": {
+          \"name\": \"$OS_TENANT_NAME\",
+          \"domain\": { \"id\": \"default\" },
+          \"password\": \"$OS_PASSWORD\"
+        }
+      }
+    }
+  }
+}"   http://$KEYSTONE:5000/v3/auth/tokens |grep "HTTP/1.1 20" 2>&1 >/dev/null; echo $?;
+RES=$?
+if [ $RES == 0 ]; then
+    echo "Deploy SUCCESS"
+else
+    echo "Deploy FAILED"
+fi
+exit $RES