From abda8f10641439f97faf407bcf6981be6e603890 Mon Sep 17 00:00:00 2001 From: Sara Nierodzik Date: Wed, 31 Jul 2019 16:47:12 +0000 Subject: [PATCH] .Zuul.yaml update for Neutron Classifier This patch updates the neutron classifier zuul yaml file. Part of neutron-sibling setup. [1] Changes based on x/vmware-nsx project. [2] Changes include: - Removes dsvm from functional job. - Removes devstack and devstack-gate from required-projects. - Adds glance, placement and nova to required projects - Makes neutron-classifier-functional-dsvm non-voting. - Changes the openstack-python3-train-jobs to project template with neutron. - Moves the tox_install_siblings to under "vars:" in .zuul.yaml [1] https://etherpad.openstack.org/p/neutron-sibling-setup [2] https://review.opendev.org/#/c/670134/ Change-Id: I031d7bef6587f0392a0416c0a29dc8caf72e98bd Co-Authored-By: Boden R --- .zuul.yaml | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index cbfb64f..78767db 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -3,20 +3,16 @@ - build-openstack-docs-pti - check-requirements - openstack-python-jobs - - openstack-python3-train-jobs + - openstack-python3-train-jobs-neutron check: jobs: - neutron-classifier-tox-lower-constraints - - neutron-classifier-functional-dsvm: - required-projects: - - openstack/neutron + - neutron-classifier-functional: + voting: false gate: queue: neutron-classifier jobs: - neutron-classifier-tox-lower-constraints - - neutron-classifier-functional-dsvm: - required-projects: - - openstack/neutron - job: name: neutron-classifier-tox-lower-constraints @@ -25,30 +21,19 @@ - openstack/neutron - job: - name: neutron-classifier-functional-dsvm - parent: legacy-dsvm-base - run: playbooks/legacy/neutron-classifier-functional-dsvm/run.yaml - post-run: playbooks/legacy/neutron-classifier-functional-dsvm/post.yaml + name: neutron-classifier-functional + parent: neutron-functional timeout: 7800 required-projects: - - openstack/devstack-gate - openstack/keystone - openstack/neutron - roles: - - zuul: openstack/devstack-gate + - openstack/glance + - openstack/nova + - openstack/placement + - openstack/python-openstackclient vars: + tox_install_siblings: true devstack_localrc: - DATABASE_PASSWORD: secretdatabase - RABBIT_PASSWORD: secretrabbit - ADMIN_PASSWORD: secretadmin - SERVICE_PASSWORD: secretservice - NETWORK_GATEWAY: 10.1.0.1 - FIXED_RANGE: 10.1.0.0/20 - IPV4_ADDRS_SAFE_TO_USE: 10.1.0.0/20 - FLOATING_RANGE: 172.24.5.0/24 - PUBLIC_NETWORK_GATEWAY: 172.24.5.1 - LOGFILE: /opt/stack/logs/devstacklog.txt - LIBVIRT_TYPE: qemu LIBS_FROM_GIT: python-openstackclient GLANCE_V1_ENABLED: true devstack_services: