summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Vaduva <Paul.Vaduva@enea.com>2016-09-07 13:22:13 +0200
committerPaul Vaduva <Paul.Vaduva@enea.com>2016-09-07 13:47:56 +0200
commit605de0faa6064fe7c698c0af94554db6f1a59f31 (patch)
tree2f92b9dafd48fc8d781e9caa192674d00b0afd0b
parent610025be08333213e1bfdbc90ff21eaf62e67839 (diff)
armband: fix job naming issue
We were refering jobs in other projects (mainly fuel) because the ci pods were named jost baremetal and virtual Change-Id: I9d02e2e61fe666f4ef46c1eb62f41da065e46059 Signed-off-by: Paul Vaduva <Paul.Vaduva@enea.com>
-rw-r--r--jjb/armband/armband-ci-jobs.yml94
1 files changed, 47 insertions, 47 deletions
diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index 664768c97..f100a46a8 100644
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -22,22 +22,22 @@
# colorado
#--------------------------------
pod:
- - baremetal:
+ - armband-baremetal:
slave-label: armband-baremetal
installer: fuel
<<: *colorado
- - virtual:
+ - armband-virtual:
slave-label: armband-virtual
installer: fuel
<<: *colorado
#--------------------------------
# master
#--------------------------------
- - baremetal:
+ - armband-baremetal:
slave-label: armband-baremetal
installer: fuel
<<: *master
- - virtual:
+ - armband-virtual:
slave-label: armband-virtual
installer: fuel
<<: *master
@@ -63,27 +63,27 @@
scenario:
# HA scenarios
- 'os-nosdn-nofeature-ha':
- auto-trigger-name: 'armband-{installer}-{scenario}-{pod}-{stream}-trigger'
+ auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
- 'os-odl_l2-nofeature-ha':
- auto-trigger-name: 'armband-{installer}-{scenario}-{pod}-{stream}-trigger'
+ auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
- 'os-odl_l3-nofeature-ha':
- auto-trigger-name: 'armband-{installer}-{scenario}-{pod}-{stream}-trigger'
+ auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
- 'os-odl_l2-bgpvpn-ha':
- auto-trigger-name: 'armband-{installer}-{scenario}-{pod}-{stream}-trigger'
+ auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
# NOHA scenarios
- 'os-odl_l2-nofeature-noha':
- auto-trigger-name: 'armband-{installer}-{scenario}-{pod}-{stream}-trigger'
+ auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
jobs:
- - 'armband-{installer}-{scenario}-{pod}-daily-{stream}'
- - 'armband-{installer}-deploy-{pod}-daily-{stream}'
+ - '{installer}-{scenario}-{pod}-daily-{stream}'
+ - '{installer}-deploy-{pod}-daily-{stream}'
########################
# job templates
########################
- job-template:
- name: 'armband-{installer}-{scenario}-{pod}-daily-{stream}'
+ name: '{installer}-{scenario}-{pod}-daily-{stream}'
concurrent: false
@@ -96,7 +96,7 @@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - 'armband-{installer}-os-.*?-{pod}-daily-.*'
+ - '{installer}-os-.*?-{pod}-daily-.*'
block-level: 'NODE'
wrappers:
@@ -120,7 +120,7 @@
builders:
- trigger-builds:
- - project: 'armband-{installer}-deploy-{pod}-daily-{stream}'
+ - project: '{installer}-deploy-{pod}-daily-{stream}'
current-parameters: false
predefined-parameters:
DEPLOY_SCENARIO={scenario}
@@ -150,7 +150,7 @@
unstable-threshold: 'FAILURE'
- job-template:
- name: 'armband-{installer}-deploy-{pod}-daily-{stream}'
+ name: '{installer}-deploy-{pod}-daily-{stream}'
concurrent: false
@@ -163,8 +163,8 @@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - 'armband-{installer}-deploy-{pod}-daily-{stream}'
- - 'armband-{installer}-deploy-generic-daily-.*'
+ - '{installer}-deploy-{pod}-daily-{stream}'
+ - '{installer}-deploy-generic-daily-.*'
block-level: 'NODE'
parameters:
@@ -226,137 +226,137 @@
# Enea Armband CI Baremetal Triggers running against master branch
#-----------------------------------------------------------------
- trigger:
- name: 'armband-fuel-os-odl_l2-nofeature-ha-baremetal-master-trigger'
+ name: 'fuel-os-odl_l2-nofeature-ha-armband-baremetal-master-trigger'
triggers:
- timed: '0 3,15 * * 1'
- trigger:
- name: 'armband-fuel-os-nosdn-nofeature-ha-baremetal-master-trigger'
+ name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-master-trigger'
triggers:
- timed: '0 3,15 * * 2'
- trigger:
- name: 'armband-fuel-os-odl_l3-nofeature-ha-baremetal-master-trigger'
+ name: 'fuel-os-odl_l3-nofeature-ha-armband-baremetal-master-trigger'
triggers:
- timed: '0 3,15 * * 3'
- trigger:
- name: 'armband-fuel-os-odl_l2-bgpvpn-ha-baremetal-master-trigger'
+ name: 'fuel-os-odl_l2-bgpvpn-ha-armband-baremetal-master-trigger'
triggers:
- timed: '0 3,15 * * 4'
- trigger:
- name: 'armband-fuel-os-odl_l2-nofeature-noha-baremetal-master-trigger'
+ name: 'fuel-os-odl_l2-nofeature-noha-armband-baremetal-master-trigger'
triggers:
- timed: '0 3,15 * * 5'
#----------------------------------------------------------------------
# Enea Armband CI Baremetal Triggers running against colorado branch
#----------------------------------------------------------------------
- trigger:
- name: 'armband-fuel-os-odl_l2-nofeature-ha-baremetal-colorado-trigger'
+ name: 'fuel-os-odl_l2-nofeature-ha-armband-baremetal-colorado-trigger'
triggers:
- timed: '0 4,16 * * 1'
- trigger:
- name: 'armband-fuel-os-nosdn-nofeature-ha-baremetal-colorado-trigger'
+ name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-colorado-trigger'
triggers:
- timed: '0 4,16 * * 2'
- trigger:
- name: 'armband-fuel-os-odl_l3-nofeature-ha-baremetal-colorado-trigger'
+ name: 'fuel-os-odl_l3-nofeature-ha-armband-baremetal-colorado-trigger'
triggers:
- timed: '0 4,16 * * 3'
- trigger:
- name: 'armband-fuel-os-odl_l2-bgpvpn-ha-baremetal-colorado-trigger'
+ name: 'fuel-os-odl_l2-bgpvpn-ha-armband-baremetal-colorado-trigger'
triggers:
- timed: '0 4,16 * * 4'
- trigger:
- name: 'armband-fuel-os-odl_l2-nofeature-noha-baremetal-colorado-trigger'
+ name: 'fuel-os-odl_l2-nofeature-noha-armband-baremetal-colorado-trigger'
triggers:
- timed: '0 4,16 * * 5'
#---------------------------------------------------------------
# Enea Armband CI Virtual Triggers running against master branch
#---------------------------------------------------------------
- trigger:
- name: 'armband-fuel-os-odl_l2-nofeature-ha-virtual-master-trigger'
+ name: 'fuel-os-odl_l2-nofeature-ha-armband-virtual-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'armband-fuel-os-nosdn-nofeature-ha-virtual-master-trigger'
+ name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'armband-fuel-os-odl_l3-nofeature-ha-virtual-master-trigger'
+ name: 'fuel-os-odl_l3-nofeature-ha-armband-virtual-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'armband-fuel-os-odl_l2-bgpvpn-ha-virtual-master-trigger'
+ name: 'fuel-os-odl_l2-bgpvpn-ha-armband-virtual-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'armband-fuel-os-odl_l2-nofeature-noha-virtual-master-trigger'
+ name: 'fuel-os-odl_l2-nofeature-noha-armband-virtual-master-trigger'
triggers:
- timed: ''
#--------------------------------------------------------------------
# Enea Armband CI Virtual Triggers running against colorado branch
#--------------------------------------------------------------------
- trigger:
- name: 'armband-fuel-os-odl_l2-nofeature-ha-virtual-colorado-trigger'
+ name: 'fuel-os-odl_l2-nofeature-ha-armband-virtual-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'armband-fuel-os-nosdn-nofeature-ha-virtual-colorado-trigger'
+ name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'armband-fuel-os-odl_l3-nofeature-ha-virtual-colorado-trigger'
+ name: 'fuel-os-odl_l3-nofeature-ha-armband-virtual-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'armband-fuel-os-odl_l2-bgpvpn-ha-virtual-colorado-trigger'
+ name: 'fuel-os-odl_l2-bgpvpn-ha-armband-virtual-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'armband-fuel-os-odl_l2-nofeature-noha-virtual-colorado-trigger'
+ name: 'fuel-os-odl_l2-nofeature-noha-armband-virtual-colorado-trigger'
triggers:
- timed: ''
#----------------------------------------------------------
# Enea Armband POD 2 Triggers running against master branch
#----------------------------------------------------------
- trigger:
- name: 'armband-fuel-os-odl_l2-nofeature-ha-arm-pod2-master-trigger'
+ name: 'fuel-os-odl_l2-nofeature-ha-arm-pod2-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'armband-fuel-os-nosdn-nofeature-ha-arm-pod2-master-trigger'
+ name: 'fuel-os-nosdn-nofeature-ha-arm-pod2-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'armband-fuel-os-odl_l3-nofeature-ha-arm-pod2-master-trigger'
+ name: 'fuel-os-odl_l3-nofeature-ha-arm-pod2-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'armband-fuel-os-odl_l2-bgpvpn-ha-arm-pod2-master-trigger'
+ name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod2-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'armband-fuel-os-odl_l2-nofeature-noha-arm-pod2-master-trigger'
+ name: 'fuel-os-odl_l2-nofeature-noha-arm-pod2-master-trigger'
triggers:
- timed: ''
#---------------------------------------------------------------
# Enea Armband POD 2 Triggers running against colorado branch
#---------------------------------------------------------------
- trigger:
- name: 'armband-fuel-os-odl_l2-nofeature-ha-arm-pod2-colorado-trigger'
+ name: 'fuel-os-odl_l2-nofeature-ha-arm-pod2-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'armband-fuel-os-nosdn-nofeature-ha-arm-pod2-colorado-trigger'
+ name: 'fuel-os-nosdn-nofeature-ha-arm-pod2-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'armband-fuel-os-odl_l3-nofeature-ha-arm-pod2-colorado-trigger'
+ name: 'fuel-os-odl_l3-nofeature-ha-arm-pod2-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'armband-fuel-os-odl_l2-bgpvpn-ha-arm-pod2-colorado-trigger'
+ name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod2-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'armband-fuel-os-odl_l2-nofeature-noha-arm-pod2-colorado-trigger'
+ name: 'fuel-os-odl_l2-nofeature-noha-arm-pod2-colorado-trigger'
triggers:
- timed: ''