summaryrefslogtreecommitdiffstats
path: root/jjb/fuel
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/fuel')
-rw-r--r--jjb/fuel/fuel-daily-jobs.yml98
-rw-r--r--jjb/fuel/fuel-project-jobs.yml2
-rw-r--r--jjb/fuel/fuel-verify-jobs.yml2
-rw-r--r--jjb/fuel/fuel-weekly-jobs.yml8
4 files changed, 61 insertions, 49 deletions
diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml
index a198751a8..9c7b5da20 100644
--- a/jjb/fuel/fuel-daily-jobs.yml
+++ b/jjb/fuel/fuel-daily-jobs.yml
@@ -16,8 +16,8 @@
branch: '{stream}'
disabled: false
gs-pathname: ''
- euphrates: &euphrates
- stream: euphrates
+ fraser: &fraser
+ stream: fraser
branch: 'stable/{stream}'
disabled: false
gs-pathname: '/{stream}'
@@ -40,10 +40,10 @@
<<: *master
- baremetal:
slave-label: fuel-baremetal
- <<: *euphrates
+ <<: *fraser
- virtual:
slave-label: fuel-virtual
- <<: *euphrates
+ <<: *fraser
# -------------------------------
# None-CI PODs
# -------------------------------
@@ -102,15 +102,11 @@
- scenario: os-odl_l2-bgpvpn-ha
stream: master
- scenario: os-odl_l2-bgpvpn-ha
- stream: euphrates
+ stream: fraser
- scenario: os-ovn-nofeature-noha
stream: danube
- - scenario: os-ovn-nofeature-noha
- stream: euphrates
- scenario: os-ovn-nofeature-ha
stream: danube
- - scenario: os-ovn-nofeature-ha
- stream: euphrates
jobs:
- 'fuel-{scenario}-{pod}-daily-{stream}'
@@ -445,72 +441,80 @@
triggers:
- timed: ''
# ----------------------------------------------
-# Triggers for job running on fuel-baremetal against euphrates branch
+# Triggers for job running on fuel-baremetal against fraser branch
# ----------------------------------------------
# HA Scenarios
- trigger:
- name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-euphrates-trigger'
+ name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-fraser-trigger'
triggers:
- timed: '' # '0 20 * * *'
- trigger:
- name: 'fuel-os-odl-nofeature-ha-baremetal-daily-euphrates-trigger'
+ name: 'fuel-os-odl-nofeature-ha-baremetal-daily-fraser-trigger'
triggers:
- timed: '' # '0 2 * * *'
- trigger:
- name: 'fuel-os-onos-sfc-ha-baremetal-daily-euphrates-trigger'
+ name: 'fuel-os-onos-sfc-ha-baremetal-daily-fraser-trigger'
triggers:
- timed: '' # '0 5 * * *'
- trigger:
- name: 'fuel-os-onos-nofeature-ha-baremetal-daily-euphrates-trigger'
+ name: 'fuel-os-ovn-nofeature-ha-baremetal-daily-fraser-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-onos-nofeature-ha-baremetal-daily-fraser-trigger'
triggers:
- timed: '' # '0 8 * * *'
- trigger:
- name: 'fuel-os-nosdn-kvm-ha-baremetal-daily-euphrates-trigger'
+ name: 'fuel-os-nosdn-kvm-ha-baremetal-daily-fraser-trigger'
triggers:
- timed: '' # '0 17 * * *'
- trigger:
- name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-euphrates-trigger'
+ name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-fraser-trigger'
triggers:
- timed: '' # '0 20 * * *'
- trigger:
- name: 'fuel-os-nosdn-kvm_ovs_dpdk-ha-baremetal-daily-euphrates-trigger'
+ name: 'fuel-os-nosdn-kvm_ovs_dpdk-ha-baremetal-daily-fraser-trigger'
triggers:
- timed: '' # '0 12 * * *'
- trigger:
- name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-ha-baremetal-daily-euphrates-trigger'
+ name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-ha-baremetal-daily-fraser-trigger'
triggers:
- timed: '' # '0 8 * * *'
# NOHA Scenarios
- trigger:
- name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-euphrates-trigger'
+ name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-fraser-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl-nofeature-noha-baremetal-daily-fraser-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl-nofeature-noha-baremetal-daily-euphrates-trigger'
+ name: 'fuel-os-onos-sfc-noha-baremetal-daily-fraser-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-onos-sfc-noha-baremetal-daily-euphrates-trigger'
+ name: 'fuel-os-onos-nofeature-noha-baremetal-daily-fraser-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-onos-nofeature-noha-baremetal-daily-euphrates-trigger'
+ name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-fraser-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-kvm-noha-baremetal-daily-euphrates-trigger'
+ name: 'fuel-os-nosdn-kvm-noha-baremetal-daily-fraser-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-euphrates-trigger'
+ name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-fraser-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-kvm_ovs_dpdk-noha-baremetal-daily-euphrates-trigger'
+ name: 'fuel-os-nosdn-kvm_ovs_dpdk-noha-baremetal-daily-fraser-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-baremetal-daily-euphrates-trigger'
+ name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-baremetal-daily-fraser-trigger'
triggers:
- timed: ''
# ----------------------------------------------
@@ -590,71 +594,79 @@
triggers:
- timed: '' # '30 20 * * *'
# ----------------------------------------------
-# Triggers for job running on fuel-virtual against euphrates branch
+# Triggers for job running on fuel-virtual against fraser branch
# ----------------------------------------------
- trigger:
- name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-euphrates-trigger'
+ name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-fraser-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-odl-nofeature-ha-virtual-daily-fraser-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl-nofeature-ha-virtual-daily-euphrates-trigger'
+ name: 'fuel-os-onos-sfc-ha-virtual-daily-fraser-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-onos-sfc-ha-virtual-daily-euphrates-trigger'
+ name: 'fuel-os-onos-nofeature-ha-virtual-daily-fraser-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-onos-nofeature-ha-virtual-daily-euphrates-trigger'
+ name: 'fuel-os-ovn-nofeature-ha-virtual-daily-fraser-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-kvm-ha-virtual-daily-euphrates-trigger'
+ name: 'fuel-os-nosdn-kvm-ha-virtual-daily-fraser-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-ovs-ha-virtual-daily-euphrates-trigger'
+ name: 'fuel-os-nosdn-ovs-ha-virtual-daily-fraser-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-kvm_ovs_dpdk-ha-virtual-daily-euphrates-trigger'
+ name: 'fuel-os-nosdn-kvm_ovs_dpdk-ha-virtual-daily-fraser-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-ha-virtual-daily-euphrates-trigger'
+ name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-ha-virtual-daily-fraser-trigger'
triggers:
- timed: ''
# NOHA Scenarios
- trigger:
- name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-euphrates-trigger'
+ name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-fraser-trigger'
triggers:
- timed: '' # '0 13 * * *'
- trigger:
- name: 'fuel-os-odl-nofeature-noha-virtual-daily-euphrates-trigger'
+ name: 'fuel-os-odl-nofeature-noha-virtual-daily-fraser-trigger'
triggers:
- timed: '' # '0 18 * * *'
- trigger:
- name: 'fuel-os-onos-sfc-noha-virtual-daily-euphrates-trigger'
+ name: 'fuel-os-ovn-nofeature-noha-virtual-daily-fraser-trigger'
+ triggers:
+ - timed: '5 23 * * *'
+- trigger:
+ name: 'fuel-os-onos-sfc-noha-virtual-daily-fraser-trigger'
triggers:
- timed: '' # '30 20 * * *'
- trigger:
- name: 'fuel-os-onos-nofeature-noha-virtual-daily-euphrates-trigger'
+ name: 'fuel-os-onos-nofeature-noha-virtual-daily-fraser-trigger'
triggers:
- timed: '' # '0 23 * * *'
- trigger:
- name: 'fuel-os-nosdn-kvm-noha-virtual-daily-euphrates-trigger'
+ name: 'fuel-os-nosdn-kvm-noha-virtual-daily-fraser-trigger'
triggers:
- timed: '' # '30 6 * * *'
- trigger:
- name: 'fuel-os-nosdn-ovs-noha-virtual-daily-euphrates-trigger'
+ name: 'fuel-os-nosdn-ovs-noha-virtual-daily-fraser-trigger'
triggers:
- timed: '' # '0 9 * * *'
- trigger:
- name: 'fuel-os-nosdn-kvm_ovs_dpdk-noha-virtual-daily-euphrates-trigger'
+ name: 'fuel-os-nosdn-kvm_ovs_dpdk-noha-virtual-daily-fraser-trigger'
triggers:
- timed: '' # '0 16 * * *'
- trigger:
- name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-virtual-daily-euphrates-trigger'
+ name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-virtual-daily-fraser-trigger'
triggers:
- timed: '' # '0 20 * * *'
# ----------------------------------------------
diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index 9e890cde7..fc49f6348 100644
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -14,7 +14,7 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
- - euphrates:
+ - fraser:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
diff --git a/jjb/fuel/fuel-verify-jobs.yml b/jjb/fuel/fuel-verify-jobs.yml
index 006b4d809..d81b0ce92 100644
--- a/jjb/fuel/fuel-verify-jobs.yml
+++ b/jjb/fuel/fuel-verify-jobs.yml
@@ -13,7 +13,7 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
- - euphrates:
+ - fraser:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
diff --git a/jjb/fuel/fuel-weekly-jobs.yml b/jjb/fuel/fuel-weekly-jobs.yml
index f21c58660..459d0d1a7 100644
--- a/jjb/fuel/fuel-weekly-jobs.yml
+++ b/jjb/fuel/fuel-weekly-jobs.yml
@@ -16,8 +16,8 @@
branch: '{stream}'
disabled: false
gs-pathname: ''
- euphrates: &euphrates
- stream: euphrates
+ fraser: &fraser
+ stream: fraser
branch: 'stable/{stream}'
disabled: false
gs-pathname: '/{stream}'
@@ -35,10 +35,10 @@
<<: *master
- baremetal:
slave-label: fuel-baremetal
- <<: *euphrates
+ <<: *fraser
- virtual:
slave-label: fuel-virtual
- <<: *euphrates
+ <<: *fraser
# -------------------------------
# scenarios
# -------------------------------