Migrate neutron-tempest-iptables_hybrid job to zuulv3 and python 3
This patch also removes config of osprofiler middleware in api-paste.ini file in neutron-tempest-iptables_hybrid job as this middleware is currently enabled by default. Change-Id: Ifd3fdc33ba5c489618a568cccc20ee14e7d600a6
This commit is contained in:
parent
c5a71bf75f
commit
0364c05de1
52
.zuul.yaml
52
.zuul.yaml
@ -242,14 +242,60 @@
|
||||
|
||||
- job:
|
||||
name: neutron-tempest-iptables_hybrid
|
||||
parent: legacy-dsvm-base
|
||||
run: playbooks/legacy/neutron-tempest-iptables_hybrid/run.yaml
|
||||
post-run: playbooks/legacy/neutron-tempest-iptables_hybrid/post.yaml
|
||||
parent: devstack-tempest
|
||||
timeout: 10800
|
||||
required-projects:
|
||||
- openstack-infra/devstack-gate
|
||||
- openstack/neutron
|
||||
- openstack/tempest
|
||||
vars:
|
||||
tempest_concurrency: 4
|
||||
tox_envlist: full
|
||||
devstack_localrc:
|
||||
USE_PYTHON3: true
|
||||
devstack_plugins:
|
||||
neutron: git://git.openstack.org/openstack/neutron.git
|
||||
devstack_services:
|
||||
tls-proxy: false
|
||||
tempest: true
|
||||
neutron-dns: true
|
||||
neutron-qos: true
|
||||
neutron-segments: true
|
||||
neutron-trunk: true
|
||||
neutron-uplink-status-propagation: true
|
||||
devstack_local_conf:
|
||||
post-config:
|
||||
$NEUTRON_CONF:
|
||||
QUOTAS:
|
||||
quota_router: 100
|
||||
quota_floatingip: 500
|
||||
quota_security_group: 100
|
||||
quota_security_group_rule: 1000
|
||||
# NOTE(slaweq): We can get rid of this hardcoded absolute path when
|
||||
# devstack-tempest job will be switched to use lib/neutron instead of
|
||||
# lib/neutron-legacy
|
||||
"/$NEUTRON_CORE_PLUGIN_CONF":
|
||||
ml2_type_vlan:
|
||||
network_vlan_ranges: foo:1:10
|
||||
agent:
|
||||
enable_distributed_routing: True
|
||||
l2_population: True
|
||||
tunnel_types: vxlan,gre
|
||||
securitygroup:
|
||||
firewall_driver: iptables_hybrid
|
||||
$NEUTRON_L3_CONF:
|
||||
agent:
|
||||
availability_zone: nova
|
||||
$NEUTRON_DHCP_CONF:
|
||||
agent:
|
||||
availability_zone: nova
|
||||
test-config:
|
||||
$TEMPEST_CONFIG:
|
||||
neutron_plugin_options:
|
||||
provider_vlans: foo,
|
||||
agent_availability_zone: nova
|
||||
image_is_advanced: true
|
||||
available_type_drivers: flat,geneve,vlan,gre,local,vxlan
|
||||
irrelevant-files: *tempest-irrelevant-files
|
||||
|
||||
- job:
|
||||
|
@ -91,7 +91,7 @@ case $VENV in
|
||||
load_rc_hook dstat
|
||||
;;
|
||||
|
||||
"api"|"api-pecan"|"full-iptables_hybrid"|"full-pecan"|"dsvm-scenario-ovs"|"dsvm-scenario-linuxbridge")
|
||||
"api"|"api-pecan"|"full-pecan"|"dsvm-scenario-ovs"|"dsvm-scenario-linuxbridge")
|
||||
# TODO(ihrachys) consider feeding result of ext-list into tempest.conf
|
||||
load_rc_hook api_all_extensions
|
||||
if [ "${FLAVOR}" = "dvrskip" ]; then
|
||||
@ -115,9 +115,6 @@ case $VENV in
|
||||
if [[ "$VENV" =~ "pecan" ]]; then
|
||||
load_conf_hook pecan
|
||||
fi
|
||||
if [[ "$VENV" =~ "iptables_hybrid" ]]; then
|
||||
load_conf_hook iptables_hybrid
|
||||
fi
|
||||
if [[ "$VENV" != "dsvm-scenario-linuxbridge" ]]; then
|
||||
load_conf_hook tunnel_types
|
||||
load_rc_hook log # bug 1743463
|
||||
|
@ -1,4 +0,0 @@
|
||||
[[post-config|/$NEUTRON_CORE_PLUGIN_CONF]]
|
||||
|
||||
[securitygroup]
|
||||
firewall_driver = iptables_hybrid
|
@ -1,15 +0,0 @@
|
||||
- hosts: primary
|
||||
tasks:
|
||||
|
||||
- name: Copy files from {{ ansible_user_dir }}/workspace/ on node
|
||||
synchronize:
|
||||
src: '{{ ansible_user_dir }}/workspace/'
|
||||
dest: '{{ zuul.executor.log_root }}'
|
||||
mode: pull
|
||||
copy_links: true
|
||||
verify_host: true
|
||||
rsync_opts:
|
||||
- --include=/logs/**
|
||||
- --include=*/
|
||||
- --exclude=*
|
||||
- --prune-empty-dirs
|
@ -1,48 +0,0 @@
|
||||
- hosts: all
|
||||
name: Neutron Tempest iptables-hybrid job
|
||||
tasks:
|
||||
|
||||
- name: Ensure legacy workspace directory
|
||||
file:
|
||||
path: '{{ ansible_user_dir }}/workspace'
|
||||
state: directory
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
set -e
|
||||
set -x
|
||||
cat > clonemap.yaml << EOF
|
||||
clonemap:
|
||||
- name: openstack-infra/devstack-gate
|
||||
dest: devstack-gate
|
||||
EOF
|
||||
/usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
|
||||
git://git.openstack.org \
|
||||
openstack-infra/devstack-gate
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
set -e
|
||||
set -x
|
||||
export PYTHONUNBUFFERED=true
|
||||
export DEVSTACK_GATE_TEMPEST=1
|
||||
export DEVSTACK_GATE_TEMPEST_FULL=1
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
export BRANCH_OVERRIDE=default
|
||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||
fi
|
||||
|
||||
function gate_hook {
|
||||
bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh full-iptables_hybrid
|
||||
}
|
||||
export -f gate_hook
|
||||
|
||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
||||
./safe-devstack-vm-gate-wrap.sh
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
Loading…
Reference in New Issue
Block a user