diff options
| -rw-r--r-- | jjb/armband/armband-ci-jobs.yml | 120 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 20 |
2 files changed, 113 insertions, 27 deletions
diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index 6ea73e12a..9493cd8f1 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -17,23 +17,44 @@ #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING #-------------------------------- -# brahmaputra +# CI POD's +#-------------------------------- +# colorado #-------------------------------- pod: - - arm-pod1: + - baremetal: + slave-label: armband-baremetal installer: fuel <<: *colorado - - arm-pod2: + - virtual: + slave-label: armband-virtual installer: fuel <<: *colorado #-------------------------------- # master #-------------------------------- - pod: - - arm-pod1: + - baremetal: + slave-label: armband-baremetal installer: fuel <<: *master + - virtual: + slave-label: armband-virtual + installer: fuel + <<: *master +#-------------------------------- +# NONE-CI POD's +#-------------------------------- +# colorado +#-------------------------------- - arm-pod2: + slave-label: arm-pod2 + installer: fuel + <<: *colorado +#-------------------------------- +# master +#-------------------------------- + - arm-pod2: + slave-label: arm-pod2 installer: fuel <<: *master #-------------------------------- @@ -89,7 +110,7 @@ - project-parameter: project: '{project}' - '{installer}-defaults' - - '{pod}-defaults': + - '{slave-label}-defaults': installer: '{installer}' - string: name: DEPLOY_SCENARIO @@ -139,7 +160,7 @@ - project-parameter: project: '{project}' - '{installer}-defaults' - - '{pod}-defaults': + - '{slave-label}-defaults': installer: '{installer}' - string: name: DEPLOY_SCENARIO @@ -190,56 +211,101 @@ # trigger macros ######################## # CI PODs -#---------------------------------------------------------- -# Enea Armband POD 1 Triggers running against master branch -#---------------------------------------------------------- +#----------------------------------------------------------------- +# Enea Armband CI Baremetal Triggers running against master branch +#----------------------------------------------------------------- - trigger: - name: 'armband-fuel-os-odl_l2-nofeature-ha-arm-pod1-master-trigger' + name: 'armband-fuel-os-odl_l2-nofeature-ha-baremetal-master-trigger' triggers: - - timed: '0 3 * * 1,4' + - timed: '0 3 * * 1' - trigger: - name: 'armband-fuel-os-nosdn-nofeature-ha-arm-pod1-master-trigger' + name: 'armband-fuel-os-nosdn-nofeature-ha-baremetal-master-trigger' triggers: - - timed: '0 15 * * 1,4' + - timed: '0 3 * * 2' - trigger: - name: 'armband-fuel-os-odl_l3-nofeature-ha-arm-pod1-master-trigger' + name: 'armband-fuel-os-odl_l3-nofeature-ha-baremetal-master-trigger' triggers: - - timed: '0 3 * * 2,5' + - timed: '0 3 * * 3' - trigger: - name: 'armband-fuel-os-odl_l2-bgpvpn-ha-arm-pod1-master-trigger' + name: 'armband-fuel-os-odl_l2-bgpvpn-ha-baremetal-master-trigger' triggers: - - timed: '0 15 * * 2,5' + - timed: '0 3 * * 4' - trigger: - name: 'armband-fuel-os-odl_l2-nofeature-noha-arm-pod1-master-trigger' + name: 'armband-fuel-os-odl_l2-nofeature-noha-baremetal-master-trigger' triggers: - - timed: '0 3 * * 3,6' + - timed: '0 3 * * 5' +#---------------------------------------------------------------------- +# Enea Armband CI Baremetal Triggers running against brahmaputra branch +#---------------------------------------------------------------------- +- trigger: + name: 'armband-fuel-os-odl_l2-nofeature-ha-baremetal-colorado-trigger' + triggers: + - timed: '0 15 * * 1' +- trigger: + name: 'armband-fuel-os-nosdn-nofeature-ha-baremetal-colorado-trigger' + triggers: + - timed: '0 15 * * 2' +- trigger: + name: 'armband-fuel-os-odl_l3-nofeature-ha-baremetal-colorado-trigger' + triggers: + - timed: '0 15 * * 3' +- trigger: + name: 'armband-fuel-os-odl_l2-bgpvpn-ha-baremetal-colorado-trigger' + triggers: + - timed: '0 15 * * 4' +- trigger: + name: 'armband-fuel-os-odl_l2-nofeature-noha-baremetal-colorado-trigger' + triggers: + - timed: '0 15 * * 5' #--------------------------------------------------------------- -# Enea Armband POD 1 Triggers running against brahmaputra branch +# Enea Armband CI Virtual Triggers running against master branch #--------------------------------------------------------------- - trigger: - name: 'armband-fuel-os-odl_l2-nofeature-ha-arm-pod1-colorado-trigger' + name: 'armband-fuel-os-odl_l2-nofeature-ha-virtual-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'armband-fuel-os-nosdn-nofeature-ha-virtual-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'armband-fuel-os-odl_l3-nofeature-ha-virtual-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'armband-fuel-os-odl_l2-bgpvpn-ha-virtual-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'armband-fuel-os-odl_l2-nofeature-noha-virtual-master-trigger' + triggers: + - timed: '' +#-------------------------------------------------------------------- +# Enea Armband CI Virtual Triggers running against brahmaputra branch +#-------------------------------------------------------------------- +- trigger: + name: 'armband-fuel-os-odl_l2-nofeature-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'armband-fuel-os-nosdn-nofeature-ha-arm-pod1-colorado-trigger' + name: 'armband-fuel-os-nosdn-nofeature-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'armband-fuel-os-odl_l3-nofeature-ha-arm-pod1-colorado-trigger' + name: 'armband-fuel-os-odl_l3-nofeature-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'armband-fuel-os-odl_l2-bgpvpn-ha-arm-pod1-colorado-trigger' + name: 'armband-fuel-os-odl_l2-bgpvpn-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'armband-fuel-os-odl_l2-nofeature-noha-arm-pod1-colorado-trigger' + name: 'armband-fuel-os-odl_l2-nofeature-noha-virtual-colorado-trigger' triggers: - timed: '' #---------------------------------------------------------- # Enea Armband POD 2 Triggers running against master branch #---------------------------------------------------------- -# No triggers for master for now - trigger: name: 'armband-fuel-os-odl_l2-nofeature-ha-arm-pod2-master-trigger' triggers: diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 59348e454..608ce43de 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -151,6 +151,16 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - parameter: + name: 'armband-baremetal-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'armband-baremetal' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' +- parameter: name: 'joid-baremetal-defaults' parameters: - label: @@ -202,6 +212,16 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - parameter: + name: 'armband-virtual-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'armband-virtual' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' +- parameter: name: 'joid-virtual-defaults' parameters: - label: |