summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcristinapauna <cristina.pauna@enea.com>2016-10-18 14:04:44 +0300
committercristinapauna <cristina.pauna@enea.com>2016-10-18 14:39:32 +0300
commit3925518c1f4db175008952b5fdc87baea5a96ddf (patch)
tree00c55efaf55ff4a758370292c2791e049ed525f1
parent307a8f07e8c17800ed1214394a3aacf02045a03a (diff)
Set arm-pod-3 as non-ci POD
arm-pod-3 will be removed as CI pod and this commit add triggers to make it a non-ci pod Change-Id: Ice16b8d32c553a059a2c9885fd801a736a59a14d Signed-off-by: cristinapauna <cristina.pauna@enea.com>
-rw-r--r--jjb/armband/armband-ci-jobs.yml70
-rw-r--r--jjb/functest/functest-ci-jobs.yml8
-rw-r--r--jjb/opnfv/slave-params.yml18
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml18
4 files changed, 114 insertions, 0 deletions
diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index d4fa5da94..2122959a9 100644
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -50,6 +50,10 @@
slave-label: arm-pod2
installer: fuel
<<: *colorado
+ - arm-pod3:
+ slave-label: arm-pod3
+ installer: fuel
+ <<: *colorado
#--------------------------------
# master
#--------------------------------
@@ -57,6 +61,10 @@
slave-label: arm-pod2
installer: fuel
<<: *master
+ - arm-pod3:
+ slave-label: arm-pod3
+ installer: fuel
+ <<: *master
#--------------------------------
# scenarios
#--------------------------------
@@ -413,3 +421,65 @@
name: 'fuel-os-odl_l2-sfc-noha-arm-pod2-colorado-trigger'
triggers:
- timed: ''
+#----------------------------------------------------------
+# Enea Armband POD 3 Triggers running against master branch
+#----------------------------------------------------------
+- trigger:
+ name: 'fuel-os-odl_l2-nofeature-ha-arm-pod3-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-nofeature-ha-arm-pod3-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l3-nofeature-ha-arm-pod3-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod3-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-nofeature-noha-arm-pod3-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-sfc-ha-arm-pod3-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-sfc-noha-arm-pod3-master-trigger'
+ triggers:
+ - timed: ''
+#---------------------------------------------------------------
+# Enea Armband POD 3 Triggers running against colorado branch
+#---------------------------------------------------------------
+- trigger:
+ name: 'fuel-os-odl_l2-nofeature-ha-arm-pod3-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-nofeature-ha-arm-pod3-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l3-nofeature-ha-arm-pod3-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod3-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-nofeature-noha-arm-pod3-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-sfc-ha-arm-pod3-colorado-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-sfc-noha-arm-pod3-colorado-trigger'
+ triggers:
+ - timed: ''
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 348779308..afeb1f92e 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -140,6 +140,10 @@
slave-label: '{pod}'
installer: fuel
<<: *master
+ - arm-pod3:
+ slave-label: '{pod}'
+ installer: fuel
+ <<: *master
- zte-pod1:
slave-label: '{pod}'
installer: fuel
@@ -164,6 +168,10 @@
slave-label: '{pod}'
installer: fuel
<<: *colorado
+ - arm-pod3:
+ slave-label: '{pod}'
+ installer: fuel
+ <<: *colorado
# PODs for verify jobs triggered by each patch upload
- ool-virtual1:
slave-label: '{pod}'
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 7eca41a6d..b46960fa7 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -611,6 +611,24 @@
default: ssh://jenkins-enea@gerrit.opnfv.org:29418/securedlab
description: 'Base URI to the configuration directory'
- parameter:
+ name: 'arm-pod3-defaults'
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - arm-pod3
+ default-slaves:
+ - arm-pod3
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+ - string:
+ name: LAB_CONFIG_URL
+ default: ssh://jenkins-enea@gerrit.opnfv.org:29418/securedlab
+ description: 'Base URI to the configuration directory'
+- parameter:
name: 'intel-virtual6-defaults'
parameters:
- node:
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 962ea4743..c10daabe0 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -172,6 +172,16 @@
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
<<: *colorado
+ - arm-pod3:
+ slave-label: '{pod}'
+ installer: fuel
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *master
+ - arm-pod3:
+ slave-label: '{pod}'
+ installer: fuel
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *colorado
- orange-pod2:
slave-label: '{pod}'
installer: joid
@@ -423,6 +433,14 @@
description: 'Arguments to use in order to choose the backend DB'
- parameter:
+ name: 'yardstick-params-arm-pod3'
+ parameters:
+ - string:
+ name: YARDSTICK_DB_BACKEND
+ default: '-i 104.197.68.199:8086'
+ description: 'Arguments to use in order to choose the backend DB'
+
+- parameter:
name: 'yardstick-params-virtual'
parameters:
- string: