[stable/train] Convert neutron-grenade job to the zuul v3 job
Other grenade jobs, like neutron-grenade-multinode are already converted to the native zuul v3 definitions but neutron-grenade job wasn't and it seems that as it is using devstack-gate project to provision vm, for some reason it stucks now and job fails with timeout. To avoid that lets convert that job to the native Zuul v3 syntax. This patch is needed only for stable/train as in newer branches we don't have that single node job anymore. This patch also switches neutron-grenade job to be voting in the check queue and to be run in the gate queue. It was made non-voting and no gating with the patch https://review.opendev.org/c/openstack/neutron/+/851330 to workaround the issue which this patch fixes. Closes-bug: #1982720 Change-Id: Iaa42e0d3020c67d22583ed70e624c401b192dc93
This commit is contained in:
parent
01c88ae08c
commit
5bd813e328
25
.zuul.yaml
25
.zuul.yaml
@ -54,8 +54,7 @@
|
||||
- neutron-tempest-iptables_hybrid
|
||||
- neutron-grenade-multinode
|
||||
- neutron-grenade-dvr-multinode
|
||||
# TODO(tkajinam): Add this job back when we make it voting again.
|
||||
#- neutron-grenade
|
||||
- neutron-grenade
|
||||
- neutron-tempest-slow-py3
|
||||
- tempest-integrated-networking
|
||||
- openstacksdk-functional-devstack
|
||||
@ -508,16 +507,28 @@
|
||||
|
||||
- job:
|
||||
name: neutron-grenade
|
||||
parent: legacy-dsvm-base
|
||||
run: playbooks/legacy/neutron-grenade/run.yaml
|
||||
post-run: playbooks/legacy/neutron-grenade/post.yaml
|
||||
parent: grenade
|
||||
timeout: 10800
|
||||
required-projects:
|
||||
- openstack/grenade
|
||||
- openstack/devstack-gate
|
||||
- openstack/neutron
|
||||
irrelevant-files: *tempest-irrelevant-files
|
||||
voting: false
|
||||
vars:
|
||||
devstack_services:
|
||||
etcd: false
|
||||
br-ex-tcpdump: true
|
||||
br-int-flows: true
|
||||
# Cinder services
|
||||
c-api: false
|
||||
c-bak: false
|
||||
c-sch: false
|
||||
c-vol: false
|
||||
cinder: false
|
||||
# Swift services
|
||||
s-account: false
|
||||
s-container: false
|
||||
s-object: false
|
||||
s-proxy: false
|
||||
|
||||
- job:
|
||||
name: neutron-tempest-postgres-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,57 +0,0 @@
|
||||
- hosts: all
|
||||
name: Autoconverted job legacy-grenade-dsvm-neutron from old job gate-grenade-dsvm-neutron-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
|
||||
cat << 'EOF' >>"/tmp/dg-local.conf"
|
||||
[[local|localrc]]
|
||||
# NOTE(mriedem): cells v2 should be the default after newton-eol
|
||||
NOVA_CONFIGURE_CELLSV2=True
|
||||
|
||||
EOF
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
set -e
|
||||
set -x
|
||||
export PROJECTS="openstack/grenade $PROJECTS"
|
||||
export PYTHONUNBUFFERED=true
|
||||
export DEVSTACK_GATE_TEMPEST=1
|
||||
export DEVSTACK_GATE_GRENADE=pullup
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
export BRANCH_OVERRIDE=default
|
||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||
fi
|
||||
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