summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-08-15 07:40:00 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-15 07:40:00 +0000
commitbee6e516f14eb1178630585e89e5dedd81135694 (patch)
tree17b71f630d3bdf6b099a381d4656f679e3d27edc
parent341749a5b6dadf4839ae289dd2441dba5a81336b (diff)
parente54e1e84b574c4a673008bf0c6ce4b7c661c075e (diff)
Merge "Add zte-pod2 CI jobs"
-rw-r--r--jjb/fuel/fuel-ci-jobs.yml82
-rw-r--r--jjb/functest/functest-ci-jobs.yml4
-rw-r--r--jjb/qtip/qtip-ci-jobs.yml7
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml13
4 files changed, 102 insertions, 4 deletions
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index b9e201d46..610e2ad4d 100644
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -32,6 +32,9 @@
- zte-pod1:
slave-label: zte-pod1
<<: *master
+ - zte-pod2:
+ slave-label: zte-pod2
+ <<: *master
- zte-pod3:
slave-label: zte-pod3
<<: *master
@@ -470,6 +473,82 @@
- timed: ''
#-----------------------------------------------
+# ZTE POD2 Triggers running against master branch
+#-----------------------------------------------
+- trigger:
+ name: 'fuel-os-nosdn-nofeature-ha-zte-pod2-daily-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-nofeature-ha-zte-pod2-daily-master-trigger'
+ triggers:
+ - timed: '0 10 * * *'
+- trigger:
+ name: 'fuel-os-odl_l3-nofeature-ha-zte-pod2-daily-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-onos-sfc-ha-zte-pod2-daily-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-onos-nofeature-ha-zte-pod2-daily-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-bgpvpn-ha-zte-pod2-daily-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-sfc-ha-zte-pod2-daily-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-kvm-ha-zte-pod2-daily-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-ovs-ha-zte-pod2-daily-master-trigger'
+ triggers:
+ - timed: ''
+# NOHA Scenarios
+- trigger:
+ name: 'fuel-os-nosdn-nofeature-noha-zte-pod2-daily-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-nofeature-noha-zte-pod2-daily-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l3-nofeature-noha-zte-pod2-daily-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-onos-sfc-noha-zte-pod2-daily-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-onos-nofeature-noha-zte-pod2-daily-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-sfc-noha-zte-pod2-daily-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl_l2-bgpvpn-noha-zte-pod2-daily-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-kvm-noha-zte-pod2-daily-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-ovs-noha-zte-pod2-daily-master-trigger'
+ triggers:
+ - timed: ''
+#-----------------------------------------------
# ZTE POD3 Triggers running against master branch
#-----------------------------------------------
- trigger:
@@ -544,4 +623,5 @@
- trigger:
name: 'fuel-os-nosdn-ovs-noha-zte-pod3-daily-master-trigger'
triggers:
- - timed: '' \ No newline at end of file
+ - timed: ''
+
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 8d6ade27d..3109fcb6e 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -119,6 +119,10 @@
slave-label: '{pod}'
installer: fuel
<<: *master
+ - zte-pod2:
+ slave-label: '{pod}'
+ installer: fuel
+ <<: *master
- zte-pod3:
slave-label: '{pod}'
installer: fuel
diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml
index ef455f8df..1123d27fb 100644
--- a/jjb/qtip/qtip-ci-jobs.yml
+++ b/jjb/qtip/qtip-ci-jobs.yml
@@ -40,11 +40,11 @@
auto-trigger-name: 'daily-trigger-disabled'
- zte-pod1:
installer: fuel
- auto-trigger-name: 'qtip-daily-zte-pod1-trigger'
+ auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- zte-pod2:
installer: fuel
- auto-trigger-name: 'daily-trigger-disabled'
+ auto-trigger-name: 'qtip-daily-zte-pod2-trigger'
<<: *master
#--------------------------------
@@ -188,6 +188,7 @@
# - timed : ' 0 0 * * *'
- trigger:
- name: 'qtip-daily-zte-pod1-trigger'
+ name: 'qtip-daily-zte-pod2-trigger'
triggers:
- timed: '0 5 * * *'
+
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 4442376fe..f952ed337 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -121,6 +121,11 @@
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
+ - zte-pod2:
+ slave-label: '{pod}'
+ installer: fuel
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *master
- zte-pod3:
slave-label: '{pod}'
installer: fuel
@@ -323,6 +328,14 @@
description: 'Arguments to use in order to choose the backend DB'
- parameter:
+ name: 'yardstick-params-zte-pod2'
+ 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-zte-pod3'
parameters:
- string: