Use the compute kit + horizon for all distros

The AIO is useful for demonstrating OpenStack, and for testing
it. The primary services required for demonstration are the
Compute Kit [1] and Horizon. This also serves us well for test
purposes. Rather than having a mix between the AIO and 'Base Kit'
in the jobs, we converge them all to the 'AIO' set and reduce
the set to only include these services.

For the 'metal' jobs we leave horizon out. At this time, horizon
binds to all listening addresses and conflicts with nginx. This
will need to be fixed in a subsequent patch.

We also switch all Xenial jobs to Bionic, and sort the services
in each scenario alphabetically to make them easier to scan when
comparing them. All the commented jobs in the zuul templates/project
are removed - they're just noise which makes reviewing things
confusing.

The OpenSUSE jobs are all set to non-voting for now due to
issues with the mirror. The bionic/ceph jobs are set to non-voting
for now while an issue with RGW is worked out that causes a segfault
when running tempest against it on bionic.

Change-Id: I67cfaaf1e0bbffbe4f00a5f145f7e410b80c3eb0
This commit is contained in:
Jesse Pretorius 2018-10-10 09:52:47 +01:00 committed by Jesse Pretorius (odyssey4me)
parent bdd8b7df7b
commit 8d25033f79
4 changed files with 113 additions and 208 deletions

View File

@ -15,35 +15,27 @@
confd_overrides:
aio_lxc:
- name: haproxy.yml.aio
- name: cinder.yml.aio
- name: designate.yml.aio
- name: glance.yml.aio
- name: heat.yml.aio
- name: haproxy.yml.aio
- name: horizon.yml.aio
- name: keystone.yml.aio
- name: neutron.yml.aio
- name: nova.yml.aio
- name: swift.yml.aio
aio_metal:
- name: cinder.yml.aio
- name: glance.yml.aio
- name: heat.yml.aio
- name: keystone.yml.aio
- name: neutron.yml.aio
- name: nova.yml.aio
- name: swift.yml.aio
aio_nspawn:
- name: haproxy.yml.aio
- name: cinder.yml.aio
- name: designate.yml.aio
- name: glance.yml.aio
- name: heat.yml.aio
- name: haproxy.yml.aio
- name: horizon.yml.aio
- name: keystone.yml.aio
- name: neutron.yml.aio
- name: nova.yml.aio
- name: swift.yml.aio
ceph:
- name: haproxy.yml.aio
- name: ceph.yml.aio
@ -53,45 +45,38 @@ confd_overrides:
- name: neutron.yml.aio
- name: nova.yml.aio
congress:
- name: congress.yml.aio
- name: haproxy.yml.aio
- name: glance.yml.aio
- name: keystone.yml.aio
- name: nova.yml.aio
- name: neutron.yml.aio
- name: keystone.yml.aio
- name: glance.yml.aio
- name: congress.yml.aio
translations:
- name: haproxy.yml.aio
- name: cinder.yml.aio
- name: designate.yml.aio
- name: glance.yml.aio
- name: haproxy.yml.aio
- name: heat.yml.aio
- name: horizon.yml.aio
- name: keystone.yml.aio
- name: magnum.yml.aio
- name: neutron.yml.aio
- name: nova.yml.aio
- name: swift.yml.aio
- name: sahara.yml.aio
- name: magnum.yml.aio
- name: swift.yml.aio
- name: trove.yml.aio
octavia:
- name: haproxy.yml.aio
- name: glance.yml.aio
- name: haproxy.yml.aio
- name: keystone.yml.aio
- name: neutron.yml.aio
- name: nova.yml.aio
- name: octavia.yml.aio
tacker:
- name: haproxy.yml.aio
- name: keystone.yml.aio
- name: heat.yml.aio
- name: tacker.yml.aio
aio_basekit:
- name: haproxy.yml.aio
- name: cinder.yml.aio
- name: glance.yml.aio
- name: keystone.yml.aio
- name: neutron.yml.aio
- name: nova.yml.aio
- name: tacker.yml.aio
barbican:
- name: haproxy.yml.aio
- name: keystone.yml.aio

View File

@ -39,22 +39,18 @@
# Ensuring overrides work
- job:
name: openstack-ansible-varstest-aio_lxc-ubuntu-bionic
parent: openstack-ansible-deploy-aio_lxc-ubuntu-bionic
vars:
action: varstest
- job:
name: openstack-ansible-varstest-aio_lxc-ubuntu-xenial
parent: openstack-ansible-deploy-aio_lxc-ubuntu-xenial
name: openstack-ansible-varstest-aio
parent: openstack-ansible-deploy-aio
nodeset: ubuntu-bionic
vars:
action: varstest
# Experimental job for checking our AIO can deploy with
# a different ansible version
- job:
name: openstack-ansible-deploy_with_ansible_devel-aio-ubuntu-xenial
parent: openstack-ansible-deploy-aio_lxc-ubuntu-xenial
name: openstack-ansible-deploy_with_ansible_devel-aio-ubuntu-bionic
parent: openstack-ansible-deploy-aio
nodeset: ubuntu-bionic
branches: ^(devel|master)$
required-projects:
- name: github.com/ansible/ansible
@ -65,8 +61,9 @@
# Experimental job for checking our AIO can deploy with
# a different ansible version
- job:
name: openstack-ansible-deploy_with_ansible_next-aio-ubuntu-xenial
parent: openstack-ansible-deploy-aio_lxc-ubuntu-xenial
name: openstack-ansible-deploy_with_ansible_next-aio-ubuntu-bionic
parent: openstack-ansible-deploy-aio
nodeset: ubuntu-bionic
branches: ^(devel|master)$
required-projects:
- name: github.com/ansible/ansible
@ -81,95 +78,90 @@
nodeset: ubuntu-bionic
- job:
name: openstack-ansible-deploy-aio_lxc-ubuntu-xenial
name: openstack-ansible-deploy-aio_distro_lxc-ubuntu-bionic
parent: openstack-ansible-deploy-aio
nodeset: ubuntu-xenial
- job:
name: openstack-ansible-deploy-aio_distro_lxc-ubuntu-xenial
parent: openstack-ansible-deploy-aio_lxc-ubuntu-xenial
nodeset: ubuntu-bionic
vars:
install_method: distro
- job:
name: openstack-ansible-deploy-ceph-ubuntu-xenial
parent: openstack-ansible-deploy-aio_lxc-ubuntu-xenial
name: openstack-ansible-deploy-ceph-ubuntu-bionic
parent: openstack-ansible-deploy-aio
nodeset: ubuntu-bionic
vars:
action: deploy
scenario: ceph
- job:
name: openstack-ansible-deploy-distro_ceph-ubuntu-xenial
parent: openstack-ansible-deploy-ceph-ubuntu-xenial
name: openstack-ansible-deploy-distro_ceph-ubuntu-bionic
parent: openstack-ansible-deploy-aio
nodeset: ubuntu-bionic
vars:
action: deploy
scenario: ceph
install_method: distro
- job:
name: openstack-ansible-deploy-aio_metal-ubuntu-xenial
parent: openstack-ansible-deploy-aio_lxc-ubuntu-xenial
name: openstack-ansible-deploy-aio_metal-ubuntu-bionic
parent: openstack-ansible-deploy-aio
nodeset: ubuntu-bionic
vars:
action: deploy
scenario: aio_metal
- job:
name: openstack-ansible-upgrade-aio_lxc-ubuntu-xenial
parent: openstack-ansible-deploy-aio_lxc-ubuntu-xenial
name: openstack-ansible-upgrade-aio_lxc-ubuntu-bionic
parent: openstack-ansible-deploy-aio
nodeset: ubuntu-bionic
timeout: 10800
vars:
action: upgrade
scenario: aio_lxc
- job:
name: openstack-ansible-deploy-aio_nspawn-ubuntu-xenial
parent: openstack-ansible-deploy-aio_lxc-ubuntu-xenial
name: openstack-ansible-deploy-aio_nspawn-ubuntu-bionic
parent: openstack-ansible-deploy-aio
nodeset: ubuntu-bionic
vars:
scenario: aio_nspawn
- job:
name: openstack-ansible-upgrade-ceph-ubuntu-xenial
parent: openstack-ansible-deploy-aio_lxc-ubuntu-xenial
name: openstack-ansible-upgrade-ceph-ubuntu-bionic
parent: openstack-ansible-deploy-aio
nodeset: ubuntu-bionic
timeout: 10800
vars:
action: upgrade
scenario: ceph
- job:
name: openstack-ansible-deploy-octavia-ubuntu-xenial
parent: openstack-ansible-deploy-aio_lxc-ubuntu-xenial
name: openstack-ansible-deploy-octavia-ubuntu-bionic
parent: openstack-ansible-deploy-aio
nodeset: ubuntu-bionic
vars:
action: deploy
scenario: octavia
- job:
name: openstack-ansible-deploy-translations-ubuntu-xenial
parent: openstack-ansible-deploy-aio_lxc-ubuntu-xenial
name: openstack-ansible-deploy-translations-ubuntu-bionic
parent: openstack-ansible-deploy-aio
nodeset: ubuntu-bionic
vars:
action: deploy
scenario: translations
- job:
name: openstack-ansible-deploy-congress-ubuntu-xenial
parent: openstack-ansible-deploy-aio_lxc-ubuntu-xenial
name: openstack-ansible-deploy-congress-ubuntu-bionic
parent: openstack-ansible-deploy-aio
nodeset: ubuntu-bionic
vars:
action: deploy
scenario: congress
- job:
name: openstack-ansible-deploy-aio_basekit-ubuntu-xenial
parent: openstack-ansible-deploy-aio_lxc-ubuntu-xenial
vars:
action: deploy
scenario: aio_basekit
- job:
name: openstack-ansible-deploy-aio_distro_basekit-ubuntu-xenial
parent: openstack-ansible-deploy-aio_basekit-ubuntu-xenial
vars:
install_method: distro
- job:
name: openstack-ansible-deploy-barbican-ubuntu-xenial
parent: openstack-ansible-deploy-aio_lxc-ubuntu-xenial
name: openstack-ansible-deploy-barbican-ubuntu-bionic
parent: openstack-ansible-deploy-aio
nodeset: ubuntu-bionic
vars:
action: deploy
scenario: barbican
@ -182,39 +174,32 @@
- job:
name: openstack-ansible-deploy-aio_distro_lxc-centos-7
parent: openstack-ansible-deploy-aio_lxc-centos-7
vars:
install_method: distro
- job:
name: openstack-ansible-deploy-aio_basekit-centos-7
parent: openstack-ansible-deploy-aio_lxc-centos-7
vars:
action: deploy
scenario: aio_basekit
- job:
name: openstack-ansible-deploy-aio_distro_basekit-centos-7
parent: openstack-ansible-deploy-aio_basekit-centos-7
parent: openstack-ansible-deploy-aio
nodeset: centos-7
vars:
install_method: distro
- job:
name: openstack-ansible-deploy-ceph-centos-7
parent: openstack-ansible-deploy-aio_lxc-centos-7
parent: openstack-ansible-deploy-aio
nodeset: centos-7
vars:
action: deploy
scenario: ceph
- job:
name: openstack-ansible-deploy-distro_ceph-centos-7
parent: openstack-ansible-deploy-ceph-centos-7
parent: openstack-ansible-deploy-aio
nodeset: centos-7
vars:
action: deploy
scenario: ceph
install_method: distro
- job:
name: openstack-ansible-upgrade-aio_lxc-centos-7
parent: openstack-ansible-deploy-aio_lxc-centos-7
parent: openstack-ansible-deploy-aio
nodeset: centos-7
timeout: 10800
vars:
action: upgrade
@ -222,20 +207,23 @@
- job:
name: openstack-ansible-deploy-aio_metal-centos-7
parent: openstack-ansible-deploy-aio_lxc-centos-7
parent: openstack-ansible-deploy-aio
nodeset: centos-7
vars:
actio: deploy
scenario: aio_metal
- job:
name: openstack-ansible-deploy-aio_nspawn-centos-7
parent: openstack-ansible-deploy-aio_lxc-centos-7
parent: openstack-ansible-deploy-aio
nodeset: centos-7
vars:
scenario: aio_nspawn
- job:
name: openstack-ansible-upgrade-ceph-centos-7
parent: openstack-ansible-deploy-aio_lxc-centos-7
parent: openstack-ansible-deploy-aio
nodeset: centos-7
timeout: 10800
vars:
action: upgrade
@ -249,39 +237,30 @@
- job:
name: openstack-ansible-deploy-aio_distro_lxc-opensuse-423
parent: openstack-ansible-deploy-aio_lxc-opensuse-423
vars:
install_method: distro
- job:
name: openstack-ansible-deploy-aio_basekit-opensuse-423
parent: openstack-ansible-deploy-aio_lxc-opensuse-423
vars:
action: deploy
scenario: aio_basekit
- job:
name: openstack-ansible-deploy-aio_distro_basekit-opensuse-423
parent: openstack-ansible-deploy-aio_basekit-opensuse-423
parent: openstack-ansible-deploy-aio
nodeset: opensuse-423
vars:
install_method: distro
- job:
name: openstack-ansible-deploy-ceph-opensuse-423
parent: openstack-ansible-deploy-aio_lxc-opensuse-423
parent: openstack-ansible-deploy-aio
nodeset: opensuse-423
vars:
action: deploy
scenario: ceph
- job:
name: openstack-ansible-deploy-distro_ceph-opensuse-423
parent: openstack-ansible-deploy-ceph-opensuse-423
parent: openstack-ansible-deploy-aio
nodeset: opensuse-423
vars:
install_method: distro
- job:
name: openstack-ansible-upgrade-aio_lxc-opensuse-423
parent: openstack-ansible-deploy-aio_lxc-opensuse-423
parent: openstack-ansible-deploy-aio
nodeset: opensuse-423
timeout: 10800
vars:
action: upgrade
@ -289,13 +268,15 @@
- job:
name: openstack-ansible-deploy-aio_metal-opensuse-423
parent: openstack-ansible-deploy-aio_lxc-opensuse-423
parent: openstack-ansible-deploy-aio
nodeset: opensuse-423
vars:
action: deploy
scenario: aio_metal
- job:
name: openstack-ansible-deploy-aio_nspawn-opensuse-423
parent: openstack-ansible-deploy-aio_lxc-opensuse-423
parent: openstack-ansible-deploy-aio
nodeset: opensuse-423
vars:
scenario: aio_nspawn

View File

@ -17,150 +17,93 @@
check:
jobs:
- openstack-ansible-linters
- openstack-ansible-varstest-aio_lxc-ubuntu-xenial
- openstack-ansible-varstest-aio
gate:
jobs:
- openstack-ansible-linters
- openstack-ansible-varstest-aio_lxc-ubuntu-xenial
- openstack-ansible-varstest-aio
periodic:
jobs:
- openstack-ansible-deploy-translations-ubuntu-xenial
- openstack-ansible-deploy-translations-ubuntu-bionic
experimental:
jobs:
- openstack-ansible-deploy-aio_nspawn-ubuntu-xenial
- openstack-ansible-deploy-barbican-ubuntu-xenial
- openstack-ansible-deploy-congress-ubuntu-xenial
- openstack-ansible-deploy-octavia-ubuntu-xenial
- openstack-ansible-deploy_with_ansible_devel-aio-ubuntu-xenial
- openstack-ansible-deploy_with_ansible_next-aio-ubuntu-xenial
- openstack-ansible-deploy-aio_nspawn-ubuntu-bionic
- openstack-ansible-deploy-barbican-ubuntu-bionic
- openstack-ansible-deploy-congress-ubuntu-bionic
- openstack-ansible-deploy-octavia-ubuntu-bionic
- openstack-ansible-deploy_with_ansible_devel-aio-ubuntu-bionic
- openstack-ansible-deploy_with_ansible_next-aio-ubuntu-bionic
# NOTE(mnaser):
# # Some AIO LXC jobs have been disabled due to the fact that they
# # time out. Instead, we rely on the basekit jobs which do not, but
# # give some coverage.
- project-template:
name: openstack-ansible-deploy-aio_lxc-jobs
check:
jobs:
# - openstack-ansible-deploy-aio_lxc-centos-7
# - openstack-ansible-deploy-aio_lxc-opensuse-423
- openstack-ansible-deploy-aio_lxc-centos-7
- openstack-ansible-deploy-aio_lxc-opensuse-423:
voting: false
- openstack-ansible-deploy-aio_lxc-ubuntu-bionic
- openstack-ansible-deploy-aio_lxc-ubuntu-xenial
gate:
jobs:
# - openstack-ansible-deploy-aio_lxc-centos-7
# - openstack-ansible-deploy-aio_lxc-opensuse-423
- openstack-ansible-deploy-aio_lxc-centos-7
- openstack-ansible-deploy-aio_lxc-ubuntu-bionic
- openstack-ansible-deploy-aio_lxc-ubuntu-xenial
periodic:
jobs:
- openstack-ansible-deploy-aio_lxc-ubuntu-bionic
- openstack-ansible-deploy-aio_lxc-ubuntu-xenial
- openstack-ansible-upgrade-aio_lxc-ubuntu-xenial
- openstack-ansible-upgrade-aio_lxc-ubuntu-bionic
# NOTE(mnaser):
# Some AIO LXC jobs have been disabled due to the fact that they
# time out. Instead, we rely on the basekit jobs which do not, but
# give some coverage.
- project-template:
name: openstack-ansible-deploy-aio_distro_lxc-jobs
check:
jobs:
# - openstack-ansible-deploy-aio_distro_lxc-centos-7
- openstack-ansible-deploy-aio_distro_lxc-centos-7:
voting: false
- openstack-ansible-deploy-aio_distro_lxc-opensuse-423:
voting: false
# - openstack-ansible-deploy-aio_distro_lxc-ubuntu-xenial
- openstack-ansible-deploy-aio_distro_lxc-ubuntu-bionic:
voting: false
gate:
jobs: []
# - openstack-ansible-deploy-aio_distro_lxc-centos-7
# - openstack-ansible-deploy-aio_distro_lxc-opensuse-423
# - openstack-ansible-deploy-aio_distro_lxc-ubuntu-xenial
- project-template:
name: openstack-ansible-deploy-aio_metal-jobs
check:
jobs:
- openstack-ansible-deploy-aio_metal-centos-7
- openstack-ansible-deploy-aio_metal-opensuse-423
- openstack-ansible-deploy-aio_metal-ubuntu-xenial
- openstack-ansible-deploy-aio_metal-opensuse-423:
voting: false
- openstack-ansible-deploy-aio_metal-ubuntu-bionic
gate:
jobs:
- openstack-ansible-deploy-aio_metal-centos-7
- openstack-ansible-deploy-aio_metal-opensuse-423
- openstack-ansible-deploy-aio_metal-ubuntu-xenial
# NOTE(mnaser): Basekit jobs disabled for other distros until stable
- project-template:
name: openstack-ansible-deploy-aio_basekit-jobs
check:
jobs:
- openstack-ansible-deploy-aio_basekit-centos-7
- openstack-ansible-deploy-aio_basekit-opensuse-423:
voting: false
# - openstack-ansible-deploy-aio_basekit-ubuntu-xenial
gate:
jobs:
- openstack-ansible-deploy-aio_basekit-centos-7
# - openstack-ansible-deploy-aio_basekit-opensuse-423
# - openstack-ansible-deploy-aio_basekit-ubuntu-xenial
# NOTE(mnaser): Distro basekit jobs disabled for other distros until stable
- project-template:
name: openstack-ansible-deploy-aio_distro_basekit-jobs
check:
jobs:
# - openstack-ansible-deploy-aio_distro_basekit-centos-7
- openstack-ansible-deploy-aio_distro_basekit-opensuse-423:
voting: false
# - openstack-ansible-deploy-aio_distro_basekit-ubuntu-xenial
gate:
jobs: []
# - openstack-ansible-deploy-aio_distro_basekit-centos-7
# - openstack-ansible-deploy-aio_distro_basekit-opensuse-423
# - openstack-ansible-deploy-aio_distro_basekit-ubuntu-xenial
- openstack-ansible-deploy-aio_metal-ubuntu-bionic
- project-template:
name: openstack-ansible-deploy-aio_nspawn-jobs
check:
jobs:
- openstack-ansible-deploy-aio_nspawn-centos-7
- openstack-ansible-deploy-aio_nspawn-opensuse-423
- openstack-ansible-deploy-aio_nspawn-ubuntu-xenial
- openstack-ansible-deploy-aio_nspawn-centos-7:
voting: false
- openstack-ansible-deploy-aio_nspawn-opensuse-423:
voting: false
- openstack-ansible-deploy-aio_nspawn-ubuntu-bionic:
voting: false
gate:
jobs:
- openstack-ansible-deploy-aio_nspawn-centos-7
- openstack-ansible-deploy-aio_nspawn-opensuse-423
- openstack-ansible-deploy-aio_nspawn-ubuntu-xenial
jobs: []
# NOTE(mnaser): Ceph jobs disabled for other distros until stable
- project-template:
name: openstack-ansible-deploy-ceph-jobs
check:
jobs:
#- openstack-ansible-deploy-ceph-centos-7
#- openstack-ansible-deploy-ceph-opensuse-423
- openstack-ansible-deploy-ceph-ubuntu-xenial
- openstack-ansible-deploy-ceph-ubuntu-bionic:
voting: false
gate:
jobs:
#- openstack-ansible-deploy-ceph-centos-7
#- openstack-ansible-deploy-ceph-opensuse-423
- openstack-ansible-deploy-ceph-ubuntu-xenial
periodic:
jobs:
- openstack-ansible-deploy-ceph-ubuntu-xenial
- openstack-ansible-upgrade-ceph-ubuntu-xenial
jobs: []
# NOTE(hwoarang): Ceph distro disabled except openSUSE until stable
- project-template:
name: openstack-ansible-deploy-distro_ceph-jobs
check:
jobs:
#- openstack-ansible-deploy-distro_ceph-centos-7
- openstack-ansible-deploy-distro_ceph-opensuse-423:
voting: false
#- openstack-ansible-deploy-distro_ceph-ubuntu-xenial
gate:
jobs: []
#- openstack-ansible-deploy-distro_ceph-centos-7
# - openstack-ansible-deploy-distro_ceph-opensuse-423
#- openstack-ansible-deploy-distro_ceph-ubuntu-xenial

View File

@ -18,9 +18,5 @@
- openstack-ansible-deploy-aio_lxc-jobs
- openstack-ansible-deploy-aio_distro_lxc-jobs
- openstack-ansible-deploy-aio_metal-jobs
- openstack-ansible-deploy-aio_basekit-jobs
- openstack-ansible-deploy-aio_distro_basekit-jobs
# NOTE(mnaser): All nspawn jobs disabled until issues resolved
# - openstack-ansible-deploy-aio_nspawn-jobs
- openstack-ansible-deploy-ceph-jobs
- openstack-ansible-deploy-distro_ceph-jobs