- enable ocl scenario only in ubuntu deployment
- disable ci jobs of Brahmaputra
- use huawei-pod1 instead untill intel8 back to online
JIRA: COMPASS-393
Change-Id: I76245d8c5f650ee85664d86fe4d9da1ca2c6e76a
Signed-off-by: meimei <meimei@huawei.com>
- huawei-pod2:
os-version: 'centos7'
<<: *master
- huawei-pod2:
os-version: 'centos7'
<<: *master
+# - intel-pod8:
+ - huawei-pod1:
os-version: 'trusty'
<<: *master
- huawei-virtual:
os-version: 'trusty'
<<: *master
- huawei-virtual:
scenario:
- 'os-nosdn-nofeature-ha':
disabled: false
scenario:
- 'os-nosdn-nofeature-ha':
disabled: false
- auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+ auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
- 'os-odl_l2-nofeature-ha':
disabled: false
- 'os-odl_l2-nofeature-ha':
disabled: false
- auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+ auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
- 'os-odl_l3-nofeature-ha':
disabled: false
- 'os-odl_l3-nofeature-ha':
disabled: false
- auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+ auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
- 'os-onos-nofeature-ha':
disabled: false
- 'os-onos-nofeature-ha':
disabled: false
- auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+ auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
- 'os-ocl-nofeature-ha':
disabled: false
- 'os-ocl-nofeature-ha':
disabled: false
- auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+ auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
jobs:
- 'compass-{scenario}-{pod}-daily-{stream}'
jobs:
- 'compass-{scenario}-{pod}-daily-{stream}'
# trigger macros
########################
- trigger:
# trigger macros
########################
- trigger:
- name: 'compass-os-nosdn-nofeature-ha-huawei-pod2-trigger'
+ name: 'compass-os-nosdn-nofeature-ha-huawei-pod2-master-trigger'
triggers:
- timed: '0 3 * * *'
- trigger:
triggers:
- timed: '0 3 * * *'
- trigger:
- name: 'compass-os-odl_l2-nofeature-ha-huawei-pod2-trigger'
+ name: 'compass-os-odl_l2-nofeature-ha-huawei-pod2-master-trigger'
triggers:
- timed: '0 21 * * *'
- trigger:
triggers:
- timed: '0 21 * * *'
- trigger:
- name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-trigger'
+ name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-master-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'compass-os-onos-nofeature-ha-huawei-pod2-trigger'
+ name: 'compass-os-onos-nofeature-ha-huawei-pod2-master-trigger'
triggers:
- timed: '0 15 * * *'
- trigger:
triggers:
- timed: '0 15 * * *'
- trigger:
- name: 'compass-os-ocl-nofeature-ha-huawei-pod2-trigger'
+ name: 'compass-os-ocl-nofeature-ha-huawei-pod2-master-trigger'
- name: 'compass-os-nosdn-nofeature-ha-huawei-pod1-trigger'
+ name: 'compass-os-nosdn-nofeature-ha-huawei-pod1-master-trigger'
- name: 'compass-os-odl_l2-nofeature-ha-huawei-pod1-trigger'
+ name: 'compass-os-odl_l2-nofeature-ha-huawei-pod1-master-trigger'
triggers:
- timed: '0 21 * * *'
- trigger:
triggers:
- timed: '0 21 * * *'
- trigger:
- name: 'compass-os-odl_l3-nofeature-ha-huawei-pod1-trigger'
+ name: 'compass-os-odl_l3-nofeature-ha-huawei-pod1-master-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'compass-os-onos-nofeature-ha-huawei-pod1-trigger'
+ name: 'compass-os-onos-nofeature-ha-huawei-pod1-master-trigger'
triggers:
- timed: '0 15 * * *'
- trigger:
triggers:
- timed: '0 15 * * *'
- trigger:
- name: 'compass-os-ocl-nofeature-ha-huawei-pod1-trigger'
+ name: 'compass-os-ocl-nofeature-ha-huawei-pod1-master-trigger'
triggers:
- timed: '0 9 * * *'
triggers:
- timed: '0 9 * * *'
- name: 'compass-os-nosdn-nofeature-ha-intel-pod8-trigger'
+ name: 'compass-os-nosdn-nofeature-ha-huawei-pod1-brahmaputra-trigger'
- name: 'compass-os-odl_l2-nofeature-ha-intel-pod8-trigger'
+ name: 'compass-os-odl_l2-nofeature-ha-huawei-pod1-brahmaputra-trigger'
- name: 'compass-os-odl_l3-nofeature-ha-intel-pod8-trigger'
+ name: 'compass-os-odl_l3-nofeature-ha-huawei-pod1-brahmaputra-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'compass-os-onos-nofeature-ha-intel-pod8-trigger'
+ name: 'compass-os-onos-nofeature-ha-huawei-pod1-brahmaputra-trigger'
- name: 'compass-os-ocl-nofeature-ha-intel-pod8-trigger'
+ name: 'compass-os-ocl-nofeature-ha-huawei-pod1-brahmaputra-trigger'
+ - timed: ''
+
+- trigger:
+ name: 'compass-os-nosdn-nofeature-ha-intel-pod8-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-odl_l2-nofeature-ha-intel-pod8-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-odl_l3-nofeature-ha-intel-pod8-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-onos-nofeature-ha-intel-pod8-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-ocl-nofeature-ha-intel-pod8-master-trigger'
+ triggers:
+ - timed: ''
+
- name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-trigger'
+ name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-master-trigger'
triggers:
- timed: '0 3 * * *'
- trigger:
triggers:
- timed: '0 3 * * *'
- trigger:
- name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-trigger'
+ name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-master-trigger'
triggers:
- timed: '0 21 * * *'
- trigger:
triggers:
- timed: '0 21 * * *'
- trigger:
- name: 'compass-os-odl_l3-nofeature-ha-huawei-virtual-trigger'
+ name: 'compass-os-odl_l3-nofeature-ha-huawei-virtual-master-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'compass-os-onos-nofeature-ha-huawei-virtual-trigger'
+ name: 'compass-os-onos-nofeature-ha-huawei-virtual-master-trigger'
triggers:
- timed: '0 15 * * *'
- trigger:
triggers:
- timed: '0 15 * * *'
- trigger:
- name: 'compass-os-ocl-nofeature-ha-huawei-virtual-trigger'
+ name: 'compass-os-ocl-nofeature-ha-huawei-virtual-master-trigger'
triggers:
- timed: '0 9 * * *'
triggers:
- timed: '0 9 * * *'
+- trigger:
+ name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-odl_l3-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-onos-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-ocl-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+ triggers:
+ - timed: ''
export CONFDIR=$WORKSPACE/deploy/conf
export ISO_URL=file://$BUILD_DIRECTORY/compass.iso
export CONFDIR=$WORKSPACE/deploy/conf
export ISO_URL=file://$BUILD_DIRECTORY/compass.iso
+
+if [[ "${DEPLOY_SCENARIO}" =~ "-ocl" ]]
+ export NETWORK_CONF_FILE=network_ocl.yml
+else
+ export NETWORK_CONF_FILE=network.yml
+fi
+
if [[ "$NODE_NAME" =~ "-virtual" ]]; then
if [[ "$NODE_NAME" =~ "-virtual" ]]; then
- export NETWORK_CONF=$CONFDIR/vm_environment/$NODE_NAME/network.yml
+ export NETWORK_CONF=$CONFDIR/vm_environment/$NODE_NAME/${NETWORK_CONF_FILE}
export DHA_CONF=$CONFDIR/vm_environment/${DEPLOY_SCENARIO}.yml
else
export INSTALL_NIC=eth1
export DHA_CONF=$CONFDIR/vm_environment/${DEPLOY_SCENARIO}.yml
else
export INSTALL_NIC=eth1
- export NETWORK_CONF=$CONFDIR/hardware_environment/$NODE_NAME/network.yml
+ export NETWORK_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${NETWORK_CONF_FILE}
export DHA_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${DEPLOY_SCENARIO}.yml
fi
export DHA_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${DEPLOY_SCENARIO}.yml
fi