summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-07-04 12:54:46 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-04 12:54:46 +0000
commit6e5fc37495ddbf9dd6ac19efe4e8fbd0aa474dfe (patch)
treee4b4f3afc5f4c0f156afd1bbc3b8c93c112ab09a
parent55a543be17edd443aad2fcff44dfceff1ea367ae (diff)
parent048babfd2a1e61334abccddc9f0469c45985ea6c (diff)
Merge "arm-pod2: Adding arm-pod2 to jenkins"
-rw-r--r--jjb/armband/armband-ci-jobs.yml9
-rw-r--r--jjb/opnfv/slave-params.yml28
2 files changed, 37 insertions, 0 deletions
diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index 3d0db6587..53c652eaf 100644
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -23,6 +23,8 @@
pod:
- arm-pod1:
<<: *brahmaputra
+ - arm-pod2:
+ <<: *brahmaputra
#--------------------------------
# master
#--------------------------------
@@ -193,3 +195,10 @@
name: 'armband-os-odl_l2-nofeature-ha-arm-pod1-brahmaputra-trigger'
triggers:
- timed: '0 18 * * *'
+#---------------------------------------------------------------
+# Enea Armband POD 2 Triggers running against brahmaputra branch
+#---------------------------------------------------------------
+- trigger:
+ name: 'armband-os-odl_l2-nofeature-ha-arm-pod2-brahmaputra-trigger'
+ triggers:
+ - timed: ''
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index da0808b76..e5313c801 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -621,6 +621,34 @@
name: LAB_CONFIG_URL
default: ssh://git@git.enea.com/pharos/lab-config
description: 'Base URI to the configuration directory'
+
+- parameter:
+ name: 'arm-pod2-defaults'
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - arm-pod2
+ default-slaves:
+ - arm-pod2
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+ - string:
+ name: DEFAULT_BRIDGE
+ default: 'admin_br0,public_br0'
+ desciption: 'The bridge to use for Fuel PXE booting. It can be a comma sparated list of bridges, in which case the first is the PXE boot bridge, and all subsequent interfaces that will be added to the VM. If left empty, most deploy scripts will default to pxebr.'
+ - string:
+ name: DEPLOY_TIMEOUT
+ default: '360'
+ description: 'Deployment timeout in minutes'
+ - string:
+ name: LAB_CONFIG_URL
+ default: ssh://git@git.enea.com/pharos/lab-config
+ description: 'Base URI to the configuration directory'
+
- parameter:
name: 'opnfv-build-centos-defaults'
parameters: