Browse Source

Migrate neutron grenade jobs to be native Zuul v3

This commit migrates neutron-grenade multinode jobs.
OVN job will be switched later.

For this ussuri backport, this also re-enables these jobs

Depends-On: https://review.opendev.org/#/c/736750/

Change-Id: Ibe613a48116aed9cbcc7c689a50c1ef9fba60f05
(cherry picked from commit bc2a23a36a)
changes/48/735948/7
Slawek Kaplonski 2 months ago
committed by Bernard Cafarelli
parent
commit
990c3732d4
No known key found for this signature in database GPG Key ID: 9531F08245465A52
6 changed files with 80 additions and 168 deletions
  1. +0
    -15
      playbooks/legacy/neutron-grenade-dvr-multinode/post.yaml
  2. +0
    -60
      playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml
  3. +0
    -15
      playbooks/legacy/neutron-grenade-multinode/post.yaml
  4. +0
    -60
      playbooks/legacy/neutron-grenade-multinode/run.yaml
  5. +76
    -10
      zuul.d/grenade.yaml
  6. +4
    -8
      zuul.d/project.yaml

+ 0
- 15
playbooks/legacy/neutron-grenade-dvr-multinode/post.yaml View File

@@ -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

+ 0
- 60
playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml View File

@@ -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 }}'

+ 0
- 15
playbooks/legacy/neutron-grenade-multinode/post.yaml View File

@@ -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

+ 0
- 60
playbooks/legacy/neutron-grenade-multinode/run.yaml View File

@@ -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 }}'

+ 76
- 10
zuul.d/grenade.yaml View File

@@ -1,12 +1,8 @@
- 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: &irrelevant-files
- ^(test-|)requirements.txt$
@@ -20,18 +16,88 @@
- ^tox.ini$
- ^vagrant/.*$
- ^migration/.*$
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: *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-ovn-grenade


+ 4
- 8
zuul.d/project.yaml View File

@@ -18,10 +18,8 @@
- neutron-fullstack
- neutron-fullstack-with-uwsgi
- neutron-rally-task
# TODO(bcafarel): temporarily disable these jobs so we can get multiple
# gate fixes properly backported
#- neutron-grenade-multinode
#- neutron-grenade-dvr-multinode
- neutron-grenade-multinode
- neutron-grenade-dvr-multinode
- neutron-tempest-linuxbridge
- neutron-tempest-with-uwsgi
- tempest-integrated-networking:
@@ -96,10 +94,8 @@
- tempest-integrated-networking
- neutron-tempest-linuxbridge
- neutron-tempest-iptables_hybrid
# TODO(bcafarel): temporarily disable these jobs so we can get multiple
# gate fixes properly backported
#- neutron-grenade-multinode
#- neutron-grenade-dvr-multinode
- neutron-grenade-multinode
- neutron-grenade-dvr-multinode
- tempest-slow-py3:
irrelevant-files: *irrelevant-files
- tempest-ipv6-only:


Loading…
Cancel
Save