Update zuul/projects.yaml

Remove all branch specifiers, the project has zuul.d backported and
branch specifiers are not needed.

Use new template for lower-constraints jobs.

Remove queue name from experimental queue, this is not needed.

Remove periodic jobs and their definitions, they do not run on stable
branches.

Change-Id: Ic36163eb1e090673383e1e1ea62a390074dbebab
This commit is contained in:
Andreas Jaeger 2018-09-05 08:46:56 +02:00
parent ed740929ce
commit 7447c32fd7
2 changed files with 6 additions and 55 deletions

View File

@ -77,32 +77,6 @@
required-projects: required-projects:
- openstack/nova-lxd - openstack/nova-lxd
- job:
name: publish-openstack-octavia-amphora-image
parent: publish-openstack-artifacts
run: playbooks/image-build/run.yaml
post-run: playbooks/image-build/post.yaml
required-projects:
- openstack/diskimage-builder
- openstack/octavia
- job:
name: publish-openstack-octavia-amphora-image-ubuntu
parent: publish-openstack-octavia-amphora-image
description: |
Publish Ubuntu-based amphora image to tarballs.o.o.
vars:
amphora_os: ubuntu
amphora_os_release: xenial
- job:
name: publish-openstack-octavia-amphora-image-centos
parent: publish-openstack-octavia-amphora-image
description: |
Publish CentOS-based amphora image to tarballs.o.o.
vars:
amphora_os: centos
amphora_image_size: 3
amphora_os_release: 7
- job: - job:
name: octavia-grenade name: octavia-grenade
parent: octavia-legacy-dsvm-base parent: octavia-legacy-dsvm-base

View File

@ -4,6 +4,7 @@
templates: templates:
- check-requirements - check-requirements
- periodic-stable-jobs-neutron - periodic-stable-jobs-neutron
- openstack-lower-constraints-jobs
- openstack-python-jobs - openstack-python-jobs
- openstack-python35-jobs - openstack-python35-jobs
- publish-openstack-docs-pti - publish-openstack-docs-pti
@ -12,14 +13,11 @@
jobs: jobs:
- neutron-lbaasv2-dsvm-api: - neutron-lbaasv2-dsvm-api:
voting: false voting: false
- neutron-lbaasv2-dsvm-py3x-api: - neutron-lbaasv2-dsvm-py3x-api
branches: ^(?!stable/ocata).*$
- neutron-lbaasv2-dsvm-scenario: - neutron-lbaasv2-dsvm-scenario:
voting: false voting: false
- neutron-lbaasv2-dsvm-py3x-scenario: - neutron-lbaasv2-dsvm-py3x-scenario:
branches: ^(?!stable/ocata).*$
voting: false voting: false
- openstack-tox-lower-constraints
- openstack-tox-functional: - openstack-tox-functional:
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$
@ -28,7 +26,6 @@
- ^etc/.*$ - ^etc/.*$
- ^releasenotes/.*$ - ^releasenotes/.*$
- openstack-tox-functional-py35: - openstack-tox-functional-py35:
branches: ^(?!stable/ocata).*$
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$
- ^api-ref/.*$ - ^api-ref/.*$
@ -36,12 +33,10 @@
- ^etc/.*$ - ^etc/.*$
- ^releasenotes/.*$ - ^releasenotes/.*$
- octavia-v1-dsvm-scenario - octavia-v1-dsvm-scenario
- octavia-v1-dsvm-py3x-scenario: - octavia-v1-dsvm-py3x-scenario
branches: ^(?!stable/ocata).*$
- octavia-v1-dsvm-scenario-multinode: - octavia-v1-dsvm-scenario-multinode:
voting: false voting: false
- octavia-v1-dsvm-py3x-scenario-multinode: - octavia-v1-dsvm-py3x-scenario-multinode:
branches: ^(?!stable/ocata).*$
voting: false voting: false
- octavia-v1-dsvm-scenario-kvm-centos.7: - octavia-v1-dsvm-scenario-kvm-centos.7:
voting: false voting: false
@ -49,14 +44,11 @@
voting: false voting: false
- octavia-v2-dsvm-noop-py35-api: - octavia-v2-dsvm-noop-py35-api:
voting: false voting: false
branches: ^(?!stable/ocata).*$
- octavia-v2-dsvm-scenario: - octavia-v2-dsvm-scenario:
voting: false voting: false
- octavia-v2-dsvm-py35-scenario: - octavia-v2-dsvm-py35-scenario:
voting: false voting: false
branches: ^(?!stable/ocata).*$
- octavia-grenade: - octavia-grenade:
branches: ^(?!stable/(ocata|pike|queens)).*$
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$
- ^api-ref/.*$ - ^api-ref/.*$
@ -71,7 +63,6 @@
gate: gate:
queue: octavia queue: octavia
jobs: jobs:
- openstack-tox-lower-constraints
- openstack-tox-functional: - openstack-tox-functional:
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$
@ -80,7 +71,6 @@
- ^etc/.*$ - ^etc/.*$
- ^releasenotes/.*$ - ^releasenotes/.*$
- openstack-tox-functional-py35: - openstack-tox-functional-py35:
branches: ^(?!stable/ocata).*$
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$
- ^api-ref/.*$ - ^api-ref/.*$
@ -88,17 +78,13 @@
- ^etc/.*$ - ^etc/.*$
- ^releasenotes/.*$ - ^releasenotes/.*$
- octavia-v1-dsvm-scenario - octavia-v1-dsvm-scenario
- octavia-v1-dsvm-py3x-scenario: - octavia-v1-dsvm-py3x-scenario
branches: ^(?!stable/ocata).*$
- octavia-v1-dsvm-scenario-multinode: - octavia-v1-dsvm-scenario-multinode:
voting: false voting: false
- octavia-v1-dsvm-py3x-scenario-multinode: - octavia-v1-dsvm-py3x-scenario-multinode:
branches: ^(?!stable/ocata).*$
voting: false voting: false
- neutron-lbaasv2-dsvm-py3x-api: - neutron-lbaasv2-dsvm-py3x-api
branches: ^(?!stable/ocata).*$
- octavia-grenade: - octavia-grenade:
branches: ^(?!stable/(ocata|pike|queens)).*$
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$
- ^api-ref/.*$ - ^api-ref/.*$
@ -111,14 +97,5 @@
- ^tox.ini$ - ^tox.ini$
- openstack-tox-cover - openstack-tox-cover
experimental: experimental:
queue: octavia
jobs: jobs:
- octavia-v1-dsvm-scenario-lxd: - octavia-v1-dsvm-scenario-lxd
branches: ^(?!stable/ocata).*$
periodic:
jobs:
- publish-openstack-octavia-amphora-image-ubuntu:
branches: ^(?!stable/.*).*$
- publish-openstack-octavia-amphora-image-centos:
branches: ^(?!stable/.*).*$