Merge "added support for kubernetes job."

3 files changed, 111 insertions, 38 deletions

diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml
index 4a50a5906..8e957ebd9 100644
--- a/jjb/global/installer-params.yml
+++ b/jjb/global/installer-params.yml
@@ -66,6 +66,10 @@
             default: joid
             description: 'Installer used for deploying OPNFV on this POD'
         - string:
+            name: MODEL
+            default: 'os'
+            description: 'Model to deploy (os|k8)'
+        - string:
             name: OS_RELEASE
             default: 'newton'
             description: 'OpenStack release (mitaka|newton)'
diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml
index 6021fbd95..ad1a76f0a 100644
--- a/jjb/joid/joid-daily-jobs.yml
+++ b/jjb/joid/joid-daily-jobs.yml
@@ -72,6 +72,10 @@
             auto-trigger-name: 'daily-trigger-disabled'
         - 'os-ocl-nofeature-noha':
             auto-trigger-name: 'daily-trigger-disabled'
+        - 'k8-nosdn-nofeature-noha':
+            auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+        - 'k8-nosdn-lb-noha':
+            auto-trigger-name: 'daily-trigger-disabled'
 
     jobs:
         - 'joid-{scenario}-{pod}-daily-{stream}'
@@ -397,3 +401,55 @@
     name: 'joid-os-nosdn-nofeature-noha-orange-pod1-danube-trigger'
     triggers:
         - timed: ''
+# k8-nosdn-nofeature-noha trigger - branch: master
+- trigger:
+    name: 'joid-k8-nosdn-nofeature-noha-baremetal-master-trigger'
+    triggers:
+        - timed: '5 15 * * *'
+- trigger:
+    name: 'joid-k8-nosdn-nofeature-noha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-k8-nosdn-nofeature-noha-orange-pod1-master-trigger'
+    triggers:
+        - timed: ''
+# k8-nosdn-nofeature-noha trigger - branch: danube
+- trigger:
+    name: 'joid-k8-nosdn-nofeature-noha-baremetal-danube-trigger'
+    triggers:
+        - timed: '0 15 * * *'
+- trigger:
+    name: 'joid-k8-nosdn-nofeature-noha-virtual-danube-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-k8-nosdn-nofeature-noha-orange-pod1-danube-trigger'
+    triggers:
+        - timed: ''
+# k8-nosdn-lb-noha trigger - branch: master
+- trigger:
+    name: 'joid-k8-nosdn-lb-noha-baremetal-master-trigger'
+    triggers:
+        - timed: '5 20 * * *'
+- trigger:
+    name: 'joid-k8-nosdn-lb-noha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-k8-nosdn-lb-noha-orange-pod1-master-trigger'
+    triggers:
+        - timed: ''
+# k8-nosdn-lb-noha trigger - branch: danube
+- trigger:
+    name: 'joid-k8-nosdn-lb-noha-baremetal-danube-trigger'
+    triggers:
+        - timed: '0 20 * * *'
+- trigger:
+    name: 'joid-k8-nosdn-lb-noha-virtual-danube-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-k8-nosdn-lb-noha-orange-pod1-danube-trigger'
+    triggers:
+        - timed: ''
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index 05c2de1fc..88dbe2214 100644
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -64,8 +64,9 @@ fi
 
 # Based on scenario naming we can get joid options
 # naming convention:
-#    os-<controller>-<nfvfeature>-<mode>[-<extrastuff>]
+#    <model>-<controller>-<nfvfeature>-<mode>[-<extrastuff>]
 # With parameters:
+#    model=(os|k8)
 #    controller=(nosdn|odl_l3|odl_l2|onos|ocl)
 #       No odl_l3 today
 #    nfvfeature=(kvm|ovs|dpdk|nofeature)
@@ -77,6 +78,7 @@ fi
 IFS='-' read -r -a DEPLOY_OPTIONS <<< "${DEPLOY_SCENARIO}--"
 #last -- need to avoid nounset error
 
+JOID_MODEL=${DEPLOY_OPTIONS[0]}
 SDN_CONTROLLER=${DEPLOY_OPTIONS[1]}
 NFV_FEATURES=${DEPLOY_OPTIONS[2]}
 HA_MODE=${DEPLOY_OPTIONS[3]}
@@ -103,49 +105,60 @@ fi
 ## Configure Joid deployment
 ##
 
-echo "------ Deploy with juju ------"
-echo "Execute: ./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES"
+if [ "$JOID_MODEL" == 'k8' ]; then
+  echo "------ Deploy with juju ------"
+  echo "Execute: ./deploy.sh -m $JOID_MODEL -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES"
 
-./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES
-exit_on_error $? "Main deploy FAILED"
+  ./deploy.sh -m kubernetes -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES
+  exit_on_error $? "Main deploy FAILED"
+fi
 
 ##
 ## Set Admin RC
 ##
-JOID_ADMIN_OPENRC=$LAB_CONFIG/admin-openrc
-echo "------ Create OpenRC file [$JOID_ADMIN_OPENRC] ------"
-
-# get controller IP
-case "$SDN_CONTROLLER" in
-    "odl")
-        SDN_CONTROLLER_IP=$(juju status odl-controller/0 |grep public-address|sed -- 's/.*\: //')
-        ;;
-    "onos")
-        SDN_CONTROLLER_IP=$(juju status onos-controller/0 |grep public-address|sed -- 's/.*\: //')
-        ;;
-    *)
-        SDN_CONTROLLER_IP='none'
-        ;;
-esac
-SDN_PASSWORD='admin'
-
-# export the openrc file by getting the one generated by joid and add SDN
-# controller for Functest
-cp ./cloud/admin-openrc $JOID_ADMIN_OPENRC
-cat << EOF >> $JOID_ADMIN_OPENRC
-export SDN_CONTROLLER=$SDN_CONTROLLER_IP
-export SDN_PASSWORD=$SDN_PASSWORD
-EOF
-
-##
-## Backup local juju env
-##
+if [ "$JOID_MODEL" == 'os' ]; then
+  echo "------ Deploy with juju ------"
+  echo "Execute: ./deploy.sh -m $JOID_MODEL -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES"
+
+  ./deploy.sh -m openstack -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES
+  exit_on_error $? "Main deploy FAILED"
+
+  JOID_ADMIN_OPENRC=$LAB_CONFIG/admin-openrc
+  echo "------ Create OpenRC file [$JOID_ADMIN_OPENRC] ------"
+
+  # get controller IP
+  case "$SDN_CONTROLLER" in
+      "odl")
+          SDN_CONTROLLER_IP=$(juju status odl-controller/0 |grep public-address|sed -- 's/.*\: //')
+          ;;
+      "onos")
+          SDN_CONTROLLER_IP=$(juju status onos-controller/0 |grep public-address|sed -- 's/.*\: //')
+          ;;
+      *)
+          SDN_CONTROLLER_IP='none'
+          ;;
+  esac
+  SDN_PASSWORD='admin'
+
+  # export the openrc file by getting the one generated by joid and add SDN
+  # controller for Functest
+  cp ./cloud/admin-openrc $JOID_ADMIN_OPENRC
+  cat << EOF >> $JOID_ADMIN_OPENRC
+  export SDN_CONTROLLER=$SDN_CONTROLLER_IP
+  export SDN_PASSWORD=$SDN_PASSWORD
+  EOF
+
+  ##
+  ## Backup local juju env
+  ##
+
+  echo "------ Backup Juju environment ------"
+  cp environments.yaml $LAB_CONFIG/
+  cp deployment.yaml $LAB_CONFIG/
+  if [ -e deployconfig.yaml ]; then
+      cp deployconfig.yaml $LAB_CONFIG
+  fi
 
-echo "------ Backup Juju environment ------"
-cp environments.yaml $LAB_CONFIG/
-cp deployment.yaml $LAB_CONFIG/
-if [ -e deployconfig.yaml ]; then
-    cp deployconfig.yaml $LAB_CONFIG
 fi
 
 ##