summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Blaisonneau <david.blaisonneau@orange.com>2016-01-13 17:38:49 +0100
committerDavid Blaisonneau <david.blaisonneau@orange.com>2016-01-14 09:35:47 +0100
commit749d23a65ded5e305d013df553082534831376e3 (patch)
treef386efcbae2ab8aaa3b90c9c41af07f8726ee77b
parent52035e5bd2487f998d2a59d0e44722654eb17f9e (diff)
joid: add juniper pod1
Change-Id: I9ff2fe3e8204d2561de140dc42a5cdb68638b3d0 Signed-off-by: David Blaisonneau <david.blaisonneau@orange.com>
-rw-r--r--jjb/joid/joid-ci-jobs.yml6
-rw-r--r--jjb/joid/joid-deploy.sh3
-rw-r--r--jjb/opnfv/slave-params.yml23
3 files changed, 32 insertions, 0 deletions
diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index ff3aa2191..04b585682 100644
--- 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 b50923f98..5ed33dec2 100644
--- 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 37af018bc..f173bd928 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -357,6 +357,29 @@
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:
- node: