summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/daisy4nfv/daisy-daily-jobs.yml61
-rw-r--r--jjb/daisy4nfv/daisy-project-jobs.yml4
-rw-r--r--jjb/yardstick/yardstick-daily-jobs.yml5
3 files changed, 63 insertions, 7 deletions
diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index 4eaa39ae9..ac172813d 100644
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -48,9 +48,12 @@
# -------------------------------
# None-CI PODs
# -------------------------------
- # - baremetal:
- # slave-label: zte-pod3
- # <<: *master
+ - zte-pod3:
+ slave-label: zte-pod3
+ <<: *master
+ - zte-pod3:
+ slave-label: zte-pod3
+ <<: *fraser
- zte-pod9:
slave-label: zte-pod9
<<: *master
@@ -191,8 +194,8 @@
blocking-jobs:
- 'daisy-kolla-build-.*'
- '{installer}-(build|deploy|test)-daily-(fraser|master)'
- - '{installer}-deploy-(baremetal|virtual|zte-pod9)-daily-(fraser|master)'
- - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(fraser|master)'
+ - '{installer}-deploy-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
+ - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
block-level: 'NODE'
parameters:
@@ -329,6 +332,54 @@
- timed: ''
# ----------------------------------------------
+# Triggers for job running on zte-pod3 against master branch
+# ----------------------------------------------
+# Basic HA Scenarios
+- trigger:
+ name: 'daisy-os-nosdn-nofeature-ha-zte-pod3-daily-master-trigger'
+ triggers:
+ - timed: ''
+# Basic NOHA Scenarios
+- trigger:
+ name: 'daisy-os-nosdn-nofeature-noha-zte-pod3-daily-master-trigger'
+ triggers:
+ - timed: ''
+# ODL Scenarios
+- trigger:
+ name: 'daisy-os-odl-nofeature-ha-zte-pod3-daily-master-trigger'
+ triggers:
+ - timed: ''
+# ovs_dpdk Scenarios
+- trigger:
+ name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod3-daily-master-trigger'
+ triggers:
+ - timed: ''
+
+# ----------------------------------------------
+# Triggers for job running on zte-pod3 against fraser branch
+# ----------------------------------------------
+# Basic HA Scenarios
+- trigger:
+ name: 'daisy-os-nosdn-nofeature-ha-zte-pod3-daily-fraser-trigger'
+ triggers:
+ - timed: ''
+# Basic NOHA Scenarios
+- trigger:
+ name: 'daisy-os-nosdn-nofeature-noha-zte-pod3-daily-fraser-trigger'
+ triggers:
+ - timed: ''
+# ODL Scenarios
+- trigger:
+ name: 'daisy-os-odl-nofeature-ha-zte-pod3-daily-fraser-trigger'
+ triggers:
+ - timed: '0 16,22 * * *'
+# ovs_dpdk Scenarios
+- trigger:
+ name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod3-daily-fraser-trigger'
+ triggers:
+ - timed: ''
+
+# ----------------------------------------------
# ZTE POD9 Triggers running against master branch
# ----------------------------------------------
# ovs_dpdk Scenarios
diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml
index 3ea74a9a8..cb0dea196 100644
--- a/jjb/daisy4nfv/daisy-project-jobs.yml
+++ b/jjb/daisy4nfv/daisy-project-jobs.yml
@@ -219,8 +219,8 @@
use-build-blocker: true
blocking-jobs:
- '{installer}-daily-(build|deploy|test)-(fraser|master)'
- - '{installer}-.*-(baremetal|virtual|zte-pod9)-daily-(fraser|master)'
- - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(fraser|master)'
+ - '{installer}-.*-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
+ - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
block-level: 'NODE'
scm:
diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml
index fefa8e68a..9814d47ef 100644
--- a/jjb/yardstick/yardstick-daily-jobs.yml
+++ b/jjb/yardstick/yardstick-daily-jobs.yml
@@ -178,6 +178,11 @@
installer: daisy
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
+ - zte-pod3:
+ slave-label: '{pod}'
+ installer: daisy
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *fraser
- orange-pod2:
slave-label: '{pod}'
installer: joid