openstack/project-config
Code Issues Proposed changes

Update networking-generic-switch jobs

Browse Source 
This patch updates networking-generic-switch jobs:
  * Run ironic-multitenant-multinode job in voting mode starting from
    Pike+
  * Drop old bash script job as it was replaced by tempest.
  * Still run ironic-multitenant single node for Newton/Ocata

Change-Id: Ia5f0e35611f37ffc38e25e5ad6702120f491a58c
This commit is contained in:
Vasyl Saienko 2017-04-03 23:12:34 +03:00
parent 2eec3c1f19
commit 0ab0a3f3c2
3 changed files with 2 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
jenkins/jobs/networking-generic-switch.yaml
View File

@ -1,51 +1,3 @@
- job-template:
name: '{pipeline}-networking-generic-switch-dsvm{suffix}'
node: '{node}'
wrappers:
- build-timeout:
timeout: 80
- timestamps
builders:
- link-logs
- net-info
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_NEUTRON=1
export BRANCH_OVERRIDE={branch-override}
export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,q-svc,q-agt,q-dhcp,q-l3
export DEVSTACK_GATE_REMOVE_STACK_SUDO=0
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
export PROJECTS="openstack/networking-generic-switch $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin networking-generic-switch https://git.openstack.org/openstack/networking-generic-switch"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"OVS_PHYSICAL_BRIDGE=brbm"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"PHYSICAL_NETWORK=mynetwork"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN=ml2"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_TENANT_VLANS=True"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_TENANT_NETWORK_TYPE=vlan"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TENANT_VLAN_RANGE=100:150"
function post_test_hook {{
source $BASE/new/devstack/openrc admin admin
sudo -E -u stack $BASE/new/networking-generic-switch/devstack/exercise.sh
}}
export -f post_test_hook
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
publishers:
- devstack-logs
- console-log
- job-template:
name: '{pipeline}-networking-generic-switch-dsvm-tempest{suffix}'
node: '{node}'

5
jenkins/jobs/projects.yaml
View File

@ -7440,11 +7440,6 @@
jobs:
- python-jobs
- pypi-jobs
- '{pipeline}-networking-generic-switch-dsvm{suffix}':
pipeline: gate
node: ubuntu-xenial
suffix: ''
branch-override: default
- '{pipeline}-networking-generic-switch-dsvm-tempest{suffix}':
pipeline: gate
node: ubuntu-xenial

4
zuul/layout.yaml
View File

@ -12615,12 +12615,12 @@ projects:
- name: check-requirements
- name: publish-to-pypi
check:
- gate-networking-generic-switch-dsvm
- gate-networking-generic-switch-dsvm-tempest
- gate-tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-ubuntu-xenial
- gate-tempest-dsvm-ironic-multitenant-network-ubuntu-xenial
gate:
- gate-networking-generic-switch-dsvm
- gate-networking-generic-switch-dsvm-tempest
- gate-tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-ubuntu-xenial
- gate-tempest-dsvm-ironic-multitenant-network-ubuntu-xenial
- name: openstack/networking-h3c