joid: add juniper pod1

Change-Id: I9ff2fe3e8204d2561de140dc42a5cdb68638b3d0
Signed-off-by: David Blaisonneau <david.blaisonneau@orange.com>

diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index ff3aa21..04b5856 100644 (file)
--- a/jjb/joid/joid-ci-jobs.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -35,6 +35,8 @@
             <<: *master
         - orange-pod2:
             <<: *master
+        - juniper-pod1:
+            <<: *master
 #--------------------------------
 # new scenario descriptions
     scenario:
@@ -190,3 +192,7 @@
     name: 'joid-os-odl_l2-nofeature-ha-orange-pod2-trigger'
     triggers:
         - timed: ''
+- trigger:
+    name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-trigger'
+    triggers:
+        - timed: ''

diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index b50923f..5ed33de 100644 (file)
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -42,6 +42,8 @@ fi
     case $NODE_NAME in
         orange-fr-pod2)
             POD=orange-pod2 ;;
+        juniper-us-test-1)
+            POD=juniper-pod1 ;;
         *)
             POD=$NODE_NAME ;;
     esac
@@ -94,6 +96,7 @@ EXTRA=${DEPLOY_OPTIONS[4]}
 case $SDN_CONTROLLER in
     odl_l2)
         SRCBUNDLE="ovs-odl"
+        SDN_CONTROLLER="odl"
         ;;
     onos)
         SRCBUNDLE="onos"

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 37af018..f173bd9 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -356,6 +356,29 @@
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
 
+- parameter:
+    name: 'juniper-pod1-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - juniper-us-test-1
+            default-slaves:
+                - juniper-us-test-1
+        - string:
+            name: INSTALLER_VERSION
+            default: latest
+            description: 'Version of the installer to deploy'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
+        - string:
+            name: CEPH_DISKS
+            default: /srv
+            description: "Disks to use by ceph (comma separated list)"
+
 - parameter:
     name: 'orange-pod2-defaults'
     parameters: