diff options
Diffstat (limited to 'jjb/compass4nfv/compass-ci-jobs.yml')
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 81 |
1 files changed, 45 insertions, 36 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index bb24fdf51..426e59777 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -10,8 +10,8 @@ stream: master branch: '{stream}' gs-pathname: '' - brahmaputra: &brahmaputra - stream: brahmaputra + colorado: &colorado + stream: colorado branch: 'stable/{stream}' gs-pathname: '/{stream}' #-------------------------------- @@ -31,11 +31,11 @@ - baremetal: slave-label: compass-baremetal os-version: 'trusty' - <<: *brahmaputra + <<: *colorado - virtual: slave-label: compass-virtual os-version: 'trusty' - <<: *brahmaputra + <<: *colorado #-------------------------------- # master #-------------------------------- @@ -48,27 +48,35 @@ - 'os-nosdn-nofeature-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' + openstack-os-version: '' - 'os-odl_l2-nofeature-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' + openstack-os-version: '' - 'os-odl_l3-nofeature-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' + openstack-os-version: '' - 'os-onos-nofeature-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' + openstack-os-version: '' - 'os-ocl-nofeature-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' + openstack-os-version: '' - 'os-onos-sfc-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' + openstack-os-version: '' - 'os-odl_l2-moon-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' + openstack-os-version: 'xenial' - 'os-nosdn-kvm-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' + openstack-os-version: '' jobs: - 'compass-{scenario}-{pod}-daily-{stream}' @@ -122,6 +130,7 @@ predefined-parameters: | DEPLOY_SCENARIO={scenario} COMPASS_OS_VERSION={os-version} + COMPASS_OS_VERSION_OPTION={openstack-os-version} same-node: true block: true - trigger-builds: @@ -238,7 +247,7 @@ - trigger: name: 'compass-os-nosdn-nofeature-ha-huawei-pod2-master-trigger' triggers: - - timed: '0 3 * * *' + - timed: '0 19 * * *' - trigger: name: 'compass-os-odl_l2-nofeature-ha-huawei-pod2-master-trigger' triggers: @@ -246,11 +255,11 @@ - trigger: name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-master-trigger' triggers: - - timed: '0 19 * * *' + - timed: '0 15 * * *' - trigger: name: 'compass-os-onos-nofeature-ha-huawei-pod2-master-trigger' triggers: - - timed: '0 15 * * *' + - timed: '' - trigger: name: 'compass-os-ocl-nofeature-ha-huawei-pod2-master-trigger' triggers: @@ -258,7 +267,7 @@ - trigger: name: 'compass-os-onos-sfc-ha-huawei-pod2-master-trigger' triggers: - - timed: '0 7 * * *' + - timed: '' - trigger: name: 'compass-os-odl_l2-moon-ha-huawei-pod2-master-trigger' triggers: @@ -271,27 +280,27 @@ - trigger: name: 'compass-os-nosdn-nofeature-ha-baremetal-master-trigger' triggers: - - timed: '0 3 * * *' + - timed: '0 2 * * *' - trigger: name: 'compass-os-odl_l2-nofeature-ha-baremetal-master-trigger' triggers: - - timed: '0 23 * * *' + - timed: '0 22 * * *' - trigger: name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger' triggers: - - timed: '0 19 * * *' + - timed: '0 18 * * *' - trigger: name: 'compass-os-onos-nofeature-ha-baremetal-master-trigger' triggers: - - timed: '0 15 * * *' + - timed: '0 14 * * *' - trigger: name: 'compass-os-ocl-nofeature-ha-baremetal-master-trigger' triggers: - - timed: '0 11 * * *' + - timed: '0 10 * * *' - trigger: name: 'compass-os-onos-sfc-ha-baremetal-master-trigger' triggers: - - timed: '0 7 * * *' + - timed: '0 6 * * *' - trigger: name: 'compass-os-odl_l2-moon-ha-baremetal-master-trigger' triggers: @@ -302,46 +311,46 @@ - timed: '' - trigger: - name: 'compass-os-nosdn-nofeature-ha-baremetal-brahmaputra-trigger' + name: 'compass-os-nosdn-nofeature-ha-baremetal-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-nofeature-ha-baremetal-brahmaputra-trigger' + name: 'compass-os-odl_l2-nofeature-ha-baremetal-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l3-nofeature-ha-baremetal-brahmaputra-trigger' + name: 'compass-os-odl_l3-nofeature-ha-baremetal-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-onos-nofeature-ha-baremetal-brahmaputra-trigger' + name: 'compass-os-onos-nofeature-ha-baremetal-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-ocl-nofeature-ha-baremetal-brahmaputra-trigger' + name: 'compass-os-ocl-nofeature-ha-baremetal-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-onos-sfc-ha-baremetal-brahmaputra-trigger' + name: 'compass-os-onos-sfc-ha-baremetal-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-moon-ha-baremetal-brahmaputra-trigger' + name: 'compass-os-odl_l2-moon-ha-baremetal-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-kvm-ha-baremetal-brahmaputra-trigger' + name: 'compass-os-nosdn-kvm-ha-baremetal-colorado-trigger' triggers: - timed: '' - trigger: name: 'compass-os-nosdn-nofeature-ha-virtual-master-trigger' triggers: - - timed: '0 3 * * *' + - timed: '0 21 * * *' - trigger: name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger' triggers: - - timed: '0 23 * * *' + - timed: '0 20 * * *' - trigger: name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger' triggers: @@ -349,53 +358,53 @@ - trigger: name: 'compass-os-onos-nofeature-ha-virtual-master-trigger' triggers: - - timed: '0 15 * * *' + - timed: '0 18 * * *' - trigger: name: 'compass-os-ocl-nofeature-ha-virtual-master-trigger' triggers: - - timed: '0 11 * * *' + - timed: '0 16 * * *' - trigger: name: 'compass-os-onos-sfc-ha-virtual-master-trigger' triggers: - - timed: '0 7 * * *' + - timed: '0 15 * * *' - trigger: name: 'compass-os-odl_l2-moon-ha-virtual-master-trigger' triggers: - - timed: '' + - timed: '0 14 * * *' - trigger: name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger' + name: 'compass-os-nosdn-nofeature-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-nofeature-ha-virtual-brahmaputra-trigger' + name: 'compass-os-odl_l2-nofeature-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l3-nofeature-ha-virtual-brahmaputra-trigger' + name: 'compass-os-odl_l3-nofeature-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-onos-nofeature-ha-virtual-brahmaputra-trigger' + name: 'compass-os-onos-nofeature-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-ocl-nofeature-ha-virtual-brahmaputra-trigger' + name: 'compass-os-ocl-nofeature-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-onos-sfc-ha-virtual-brahmaputra-trigger' + name: 'compass-os-onos-sfc-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-moon-ha-virtual-brahmaputra-trigger' + name: 'compass-os-odl_l2-moon-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-kvm-ha-virtual-brahmaputra-trigger' + name: 'compass-os-nosdn-kvm-ha-virtual-colorado-trigger' triggers: - timed: '' |