openstack
/
octavia
Code Issues Proposed changes

Gate on octavia-dsvm-base based jobs and housekeeping 

In Rocky, octavia-tempest-plugin (v2) got a significant bump in test coverage
surprassing existing tempest tests in Octavia repo (v1). The direction
we are pursuing is to move to v2 only anyway and drop v1 altogether once
neutron-lbaas is dropped. Hence, we should also gate on octavia v2 jobs.

This patch also proposes gating on octavia-v2-dsvm-scenario-centos-7 job
and octavia-v2-dsvm-scenario-ubuntu-bionic as check job.

In addition, this patch cleans up remaining leftovers when transitioned
to Zuul v3, as well removes jobs octavia-v1-dsvm-scenario-multinode and
octavia-v1-dsvm-py3x-scenario-multinode from gate list and nuke
octavia-v1-dsvm-scenario-lxd.

Depends-On: https://review.openstack.org/#/c/600118

Change-Id: I7d2d8223e0b876257dd6a639fc92cbb11f0d6338
This commit is contained in:
Carlos Goncalves 2018-07-31 15:30:12 +02:00
parent c7395e0488
commit 326713c54c
4 changed files with 11 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
playbooks/legacy/octavia-v1-dsvm-scenario-kvm-centos.7/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

83
playbooks/legacy/octavia-v1-dsvm-scenario-kvm-centos.7/run.yaml
View File

@ -1,83 +0,0 @@
- hosts: all
name: Autoconverted job legacy-octavia-v1-dsvm-scenario-kvm-centos.7 from old job
gate-octavia-v1-dsvm-scenario-kvm-centos.7-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-infra/devstack-gate
dest: devstack-gate
EOF
/usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
git://git.openstack.org \
openstack-infra/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]]
OCTAVIA_HYPERVISOR=kvm
OCTAVIA_AMP_BASE_OS=centos
OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID=7
OCTAVIA_AMP_IMAGE_SIZE=3
EOF
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_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_NOTESTS=1
export DEVSTACK_GATE_EXERCISES=0
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_INSTALL_TESTONLY=1
export BRANCH_OVERRIDE=default
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
export PROJECTS="openstack/barbican $PROJECTS"
export PROJECTS="openstack/python-barbicanclient $PROJECTS"
export PROJECTS="openstack/diskimage-builder $PROJECTS"
export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
export PROJECTS="openstack/neutron-lbaas $PROJECTS"
export PROJECTS="openstack/octavia $PROJECTS"
if ! [[ "$ZUUL_BRANCH" =~ "stable/newton"|"stable/ocata" ]]; then
export DEVSTACK_PROJECT_FROM_GIT="python-octaviaclient"
export OVERRIDE_PYTHON_OCTAVIACLIENT_PROJECT_BRANCH=$ZUUL_BRANCH
fi
function gate_hook {
$BASE/new/octavia/octavia/tests/contrib/gate_hook.sh tempest v1 scenario
}
export -f gate_hook
function post_test_hook {
$BASE/new/octavia/octavia/tests/contrib/post_test_hook.sh tempest v1 scenario
}
export -f post_test_hook
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 }}'

14
zuul.d/jobs.yaml
View File

@ -63,20 +63,6 @@
run: playbooks/legacy/octavia-v1-dsvm-py3x-scenario-multinode/run.yaml
post-run: playbooks/legacy/octavia-v1-dsvm-py3x-scenario-multinode/post.yaml
- job:
name: octavia-v1-dsvm-scenario-kvm-centos.7
parent: octavia-legacy-dsvm-base
run: playbooks/legacy/octavia-v1-dsvm-scenario-kvm-centos.7/run.yaml
post-run: playbooks/legacy/octavia-v1-dsvm-scenario-kvm-centos.7/post.yaml
- job:
name: octavia-v1-dsvm-scenario-lxd
parent: octavia-legacy-dsvm-base
run: playbooks/legacy/octavia-v1-dsvm-scenario-lxd/run.yaml
post-run: playbooks/legacy/octavia-v1-dsvm-scenario-lxd/post.yaml
required-projects:
- openstack/nova-lxd
- job:
name: publish-openstack-octavia-amphora-image
parent: publish-openstack-artifacts

19
zuul.d/projects.yaml
View File

@ -39,7 +39,12 @@
voting: false
- octavia-v1-dsvm-py3x-scenario-multinode:
voting: false
- octavia-v1-dsvm-scenario-kvm-centos.7:
- octavia-v2-dsvm-noop-api
- octavia-v2-dsvm-noop-py35-api
- octavia-v2-dsvm-scenario
- octavia-v2-dsvm-py35-scenario
- octavia-v2-dsvm-scenario-centos-7
- octavia-v2-dsvm-scenario-ubuntu-bionic:
voting: false
- octavia-v2-dsvm-noop-api:
voting: false
@ -79,12 +84,13 @@
- ^releasenotes/.*$
- octavia-v1-dsvm-scenario
- octavia-v1-dsvm-py3x-scenario
- octavia-v1-dsvm-scenario-multinode:
voting: false
- octavia-v1-dsvm-py3x-scenario-multinode:
voting: false
- neutron-lbaasv2-dsvm-api
- neutron-lbaasv2-dsvm-py3x-api
- octavia-v2-dsvm-noop-api
- octavia-v2-dsvm-noop-py35-api
- octavia-v2-dsvm-scenario
- octavia-v2-dsvm-py35-scenario
- octavia-v2-dsvm-scenario-centos-7
- octavia-grenade:
irrelevant-files:
- ^.*\.rst$
@ -96,9 +102,6 @@
- ^tools/.*$
- ^(test-|)requirements.txt$
- ^tox.ini$
experimental:
jobs:
- octavia-v1-dsvm-scenario-lxd
periodic:
jobs:
- publish-openstack-octavia-amphora-image-ubuntu: