Migrate neutron grenade jobs to be native Zuul v3
This commit migrates neutron-grenade multinode jobs. OVN job will be switched later. Change-Id: Ibe613a48116aed9cbcc7c689a50c1ef9fba60f05
This commit is contained in:
Slawek Kaplonski
parent
34448578cb
commit
bc2a23a36a
@ -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,60 +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"
|
|
||||||
|
|
||||||
# Disable some services to use less memory
|
|
||||||
# Cinder-backup
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service c-bak"
|
|
||||||
# Etcd
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service etcd3"
|
|
||||||
# Swift
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account"
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-container"
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-container-sync"
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-object"
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-proxy"
|
|
||||||
|
|
||||||
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,60 +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"
|
|
||||||
|
|
||||||
# Disable some services to use less memory
|
|
||||||
# Cinder
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service c-bak"
|
|
||||||
# Etcd
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service etcd3"
|
|
||||||
# Swift
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account"
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-container"
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-container-sync"
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-object"
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-proxy"
|
|
||||||
|
|
||||||
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,12 +1,8 @@
|
|||||||
- job:
|
- job:
|
||||||
name: neutron-grenade-multinode
|
name: neutron-grenade-multinode
|
||||||
parent: legacy-dsvm-base-multinode
|
parent: grenade-multinode
|
||||||
run: playbooks/legacy/neutron-grenade-multinode/run.yaml
|
|
||||||
post-run: playbooks/legacy/neutron-grenade-multinode/post.yaml
|
|
||||||
timeout: 10800
|
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack/grenade
|
- openstack/grenade
|
||||||
- openstack/devstack-gate
|
|
||||||
- openstack/neutron
|
- openstack/neutron
|
||||||
irrelevant-files: &irrelevant-files
|
irrelevant-files: &irrelevant-files
|
||||||
- ^(test-|)requirements.txt$
|
- ^(test-|)requirements.txt$
|
||||||
@ -20,18 +16,88 @@
|
|||||||
- ^tox.ini$
|
- ^tox.ini$
|
||||||
- ^vagrant/.*$
|
- ^vagrant/.*$
|
||||||
- ^migration/.*$
|
- ^migration/.*$
|
||||||
|
vars:
|
||||||
|
devstack_services:
|
||||||
|
c-bak: false
|
||||||
|
etcd: false
|
||||||
|
s-account: false
|
||||||
|
s-container: false
|
||||||
|
s-object: false
|
||||||
|
s-proxy: false
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: neutron-grenade-dvr-multinode
|
name: neutron-grenade-dvr-multinode
|
||||||
parent: legacy-dsvm-base-multinode
|
parent: grenade-multinode
|
||||||
run: playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml
|
pre-run: playbooks/dvr-multinode-scenario-pre-run.yaml
|
||||||
post-run: playbooks/legacy/neutron-grenade-dvr-multinode/post.yaml
|
roles:
|
||||||
timeout: 7500
|
- zuul: openstack/neutron-tempest-plugin
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack/grenade
|
- openstack/grenade
|
||||||
- openstack/devstack-gate
|
|
||||||
- openstack/neutron
|
- openstack/neutron
|
||||||
irrelevant-files: *irrelevant-files
|
irrelevant-files: *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:
|
- job:
|
||||||
name: neutron-ovn-grenade
|
name: neutron-ovn-grenade
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user