Migrate neutron grenade multinode jobs to be native Zuul v3
This commit migrates neutron-grenade multinode jobs. This is manual backport of this as zuul dir structure is changed in ussuri and clean backport is not possible. - https://review.opendev.org/#/c/735948/3 Change-Id: I20533a034d28d5e405b3f7d49855cdc8e0815e90
This commit is contained in:
Ghanshyam Mann
parent
c2cad3f9fe
commit
c5e00e551c
86
.zuul.yaml
86
.zuul.yaml
|
|
@ -226,27 +226,93 @@
|
|||
|
||||
- job:
|
||||
name: neutron-grenade-multinode
|
||||
parent: legacy-dsvm-base-multinode
|
||||
run: playbooks/legacy/neutron-grenade-multinode/run.yaml
|
||||
post-run: playbooks/legacy/neutron-grenade-multinode/post.yaml
|
||||
timeout: 10800
|
||||
parent: grenade-multinode
|
||||
required-projects:
|
||||
- openstack/grenade
|
||||
- openstack/devstack-gate
|
||||
- openstack/neutron
|
||||
irrelevant-files: *tempest-irrelevant-files
|
||||
vars:
|
||||
devstack_services:
|
||||
c-bak: false
|
||||
etcd: false
|
||||
s-account: false
|
||||
s-container: false
|
||||
s-object: false
|
||||
s-proxy: false
|
||||
|
||||
- job:
|
||||
name: neutron-grenade-dvr-multinode
|
||||
parent: legacy-dsvm-base-multinode
|
||||
run: playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml
|
||||
post-run: playbooks/legacy/neutron-grenade-dvr-multinode/post.yaml
|
||||
timeout: 7500
|
||||
parent: grenade-multinode
|
||||
pre-run: playbooks/dvr-multinode-scenario-pre-run.yaml
|
||||
roles:
|
||||
- zuul: openstack/neutron-tempest-plugin
|
||||
required-projects:
|
||||
- openstack/grenade
|
||||
- openstack/devstack-gate
|
||||
- openstack/neutron
|
||||
irrelevant-files: *tempest-irrelevant-files
|
||||
vars:
|
||||
devstack_services:
|
||||
c-bak: false
|
||||
etcd: false
|
||||
s-account: false
|
||||
s-container: false
|
||||
s-object: false
|
||||
s-proxy: false
|
||||
devstack_local_conf:
|
||||
post-config:
|
||||
$NEUTRON_CONF:
|
||||
DEFAULT:
|
||||
router_distributed: True
|
||||
# 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:
|
||||
mechanism_drivers: openvswitch,l2population
|
||||
agent:
|
||||
enable_distributed_routing: True
|
||||
l2_population: True
|
||||
tunnel_types: vxlan
|
||||
arp_responder: True
|
||||
ovs:
|
||||
tunnel_bridge: br-tun
|
||||
bridge_mappings: public:br-ex
|
||||
$NEUTRON_L3_CONF:
|
||||
DEFAULT:
|
||||
agent_mode: dvr
|
||||
agent:
|
||||
availability_zone: nova
|
||||
$NEUTRON_DHCP_CONF:
|
||||
agent:
|
||||
availability_zone: nova
|
||||
group-vars:
|
||||
subnode:
|
||||
devstack_services:
|
||||
q-agt: true
|
||||
q-l3: true
|
||||
q-meta: true
|
||||
devstack_local_conf:
|
||||
post-config:
|
||||
$NEUTRON_CONF:
|
||||
DEFAULT:
|
||||
router_distributed: True
|
||||
# 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":
|
||||
agent:
|
||||
enable_distributed_routing: True
|
||||
l2_population: True
|
||||
tunnel_types: vxlan
|
||||
arp_responder: True
|
||||
ovs:
|
||||
tunnel_bridge: br-tun
|
||||
bridge_mappings: public:br-ex
|
||||
$NEUTRON_L3_CONF:
|
||||
DEFAULT:
|
||||
agent_mode: dvr_snat
|
||||
agent:
|
||||
availability_zone: nova
|
||||
|
||||
- job:
|
||||
name: neutron-tempest-dvr-ha-multinode-full
|
||||
|
|
|
|||
|
|
@ -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: primary
|
||||
name: Autoconverted job legacy-grenade-dsvm-neutron-dvr-multinode from old job gate-grenade-dsvm-neutron-dvr-multinode-ubuntu-xenial-nv
|
||||
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/devstack-gate
|
||||
dest: devstack-gate
|
||||
EOF
|
||||
/usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
|
||||
https://opendev.org \
|
||||
openstack/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_NEUTRON=1
|
||||
export DEVSTACK_GATE_CONFIGDRIVE=0
|
||||
export DEVSTACK_GATE_GRENADE=pullup
|
||||
export DEVSTACK_GATE_USE_PYTHON3=True
|
||||
# Test DVR upgrade on multinode
|
||||
export PROJECTS="openstack/grenade $PROJECTS"
|
||||
export DEVSTACK_GATE_NEUTRON_DVR=1
|
||||
export BRANCH_OVERRIDE=default
|
||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||
fi
|
||||
export DEVSTACK_GATE_TOPOLOGY="multinode"
|
||||
|
||||
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 }}'
|
||||
|
|
@ -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: primary
|
||||
name: Autoconverted job legacy-grenade-dsvm-neutron-multinode from old job gate-grenade-dsvm-neutron-multinode-ubuntu-xenial
|
||||
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/devstack-gate
|
||||
dest: devstack-gate
|
||||
EOF
|
||||
/usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
|
||||
https://opendev.org \
|
||||
openstack/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_NEUTRON=1
|
||||
export DEVSTACK_GATE_CONFIGDRIVE=0
|
||||
export DEVSTACK_GATE_GRENADE=pullup
|
||||
export DEVSTACK_GATE_USE_PYTHON3=True
|
||||
export PROJECTS="openstack/grenade $PROJECTS"
|
||||
# Default to non DVR
|
||||
export DEVSTACK_GATE_NEUTRON_DVR=0
|
||||
export BRANCH_OVERRIDE=default
|
||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||
fi
|
||||
export DEVSTACK_GATE_TOPOLOGY="multinode"
|
||||
|
||||
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