Merge "[stable/train] Convert neutron-grenade job to the zuul v3 job" into stable/train
This commit is contained in:
commit
5af47afb54
25
.zuul.yaml
25
.zuul.yaml
|
@ -54,8 +54,7 @@
|
||||||
- neutron-tempest-iptables_hybrid
|
- neutron-tempest-iptables_hybrid
|
||||||
- neutron-grenade-multinode
|
- neutron-grenade-multinode
|
||||||
- neutron-grenade-dvr-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
|
- neutron-tempest-slow-py3
|
||||||
- tempest-integrated-networking
|
- tempest-integrated-networking
|
||||||
- openstacksdk-functional-devstack
|
- openstacksdk-functional-devstack
|
||||||
|
@ -508,16 +507,28 @@
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: neutron-grenade
|
name: neutron-grenade
|
||||||
parent: legacy-dsvm-base
|
parent: grenade
|
||||||
run: playbooks/legacy/neutron-grenade/run.yaml
|
|
||||||
post-run: playbooks/legacy/neutron-grenade/post.yaml
|
|
||||||
timeout: 10800
|
timeout: 10800
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack/grenade
|
- openstack/grenade
|
||||||
- openstack/devstack-gate
|
|
||||||
- openstack/neutron
|
- openstack/neutron
|
||||||
irrelevant-files: *tempest-irrelevant-files
|
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:
|
- job:
|
||||||
name: neutron-tempest-postgres-full
|
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