summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/armband/armband-ci-jobs.yml46
-rw-r--r--jjb/armband/armband-verify-jobs.yml2
2 files changed, 26 insertions, 22 deletions
diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index 1c5f14880..c74e3c83d 100644
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -12,8 +12,8 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
- euphrates: &euphrates
- stream: euphrates
+ fraser: &fraser
+ stream: fraser
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
@@ -33,16 +33,16 @@
# -------------------------------
# CI POD's
# -------------------------------
- # euphrates
+ # fraser
# -------------------------------
pod:
# yamllint disable rule:key-duplicates
- armband-baremetal:
<<: *baremetal
- <<: *euphrates
+ <<: *fraser
- armband-virtual:
<<: *virtual
- <<: *euphrates
+ <<: *fraser
# -------------------------------
# master
# -------------------------------
@@ -71,10 +71,6 @@
- 'os-nosdn-nofeature-noha':
auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
- exclude:
- - scenario: os-ovn-nofeature-ha
- stream: euphrates
-
jobs:
- '{installer}-{scenario}-{pod}-daily-{stream}'
- '{installer}-deploy-{pod}-daily-{stream}'
@@ -302,24 +298,28 @@
triggers:
- timed: '0 1 * * 1,3'
# ---------------------------------------------------------------------
-# Enea Armband CI Baremetal Triggers running against euphrates branch
+# Enea Armband CI Baremetal Triggers running against fraser branch
# ---------------------------------------------------------------------
- trigger:
- name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-euphrates-trigger'
+ name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-fraser-trigger'
triggers:
- - timed: ''
+ - timed: '0 1 * * 4,6'
- trigger:
- name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-euphrates-trigger'
+ name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-fraser-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl-nofeature-ha-armband-baremetal-euphrates-trigger'
+ name: 'fuel-os-odl-nofeature-ha-armband-baremetal-fraser-trigger'
triggers:
- - timed: ''
+ - timed: '0 1 * * 2,5,7'
- trigger:
- name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-euphrates-trigger'
+ name: 'fuel-os-ovn-nofeature-ha-armband-baremetal-fraser-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-fraser-trigger'
+ triggers:
+ - timed: '0 1 * * 1,3'
# --------------------------------------------------------------
# Enea Armband CI Virtual Triggers running against master branch
@@ -345,21 +345,25 @@
triggers:
- timed: ''
# -------------------------------------------------------------------
-# Enea Armband CI Virtual Triggers running against euphrates branch
+# Enea Armband CI Virtual Triggers running against fraser branch
# -------------------------------------------------------------------
- trigger:
- name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-euphrates-trigger'
+ name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-fraser-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-nofeature-noha-armband-virtual-fraser-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-nofeature-noha-armband-virtual-euphrates-trigger'
+ name: 'fuel-os-odl-nofeature-ha-armband-virtual-fraser-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl-nofeature-ha-armband-virtual-euphrates-trigger'
+ name: 'fuel-os-ovn-nofeature-ha-armband-virtual-fraser-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-ovs-ha-armband-virtual-euphrates-trigger'
+ name: 'fuel-os-nosdn-ovs-ha-armband-virtual-fraser-trigger'
triggers:
- timed: ''
diff --git a/jjb/armband/armband-verify-jobs.yml b/jjb/armband/armband-verify-jobs.yml
index 1ebb7df5c..c800872c7 100644
--- a/jjb/armband/armband-verify-jobs.yml
+++ b/jjb/armband/armband-verify-jobs.yml
@@ -13,7 +13,7 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
- - euphrates:
+ - fraser:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false