Make devstack run on focal (Ubuntu LTS 20.04)
- Add a nodeset and a platform job - Drop uwsgi-py2 pkg that no longer exists - Blacklist tests that are currently failing Change-Id: Ib4416dc2f5e003fd770f5240a8f78213c56af8e6
This commit is contained in:

committed by
Jens Harbott

parent
f1ed7c77c5
commit
3480093b93
19
.zuul.yaml
19
.zuul.yaml
@@ -8,6 +8,16 @@
|
|||||||
nodes:
|
nodes:
|
||||||
- controller
|
- controller
|
||||||
|
|
||||||
|
- nodeset:
|
||||||
|
name: openstack-single-node-focal
|
||||||
|
nodes:
|
||||||
|
- name: controller
|
||||||
|
label: ubuntu-focal
|
||||||
|
groups:
|
||||||
|
- name: tempest
|
||||||
|
nodes:
|
||||||
|
- controller
|
||||||
|
|
||||||
- nodeset:
|
- nodeset:
|
||||||
name: openstack-single-node-bionic
|
name: openstack-single-node-bionic
|
||||||
nodes:
|
nodes:
|
||||||
@@ -512,6 +522,14 @@
|
|||||||
parent: tempest-full-py3
|
parent: tempest-full-py3
|
||||||
description: openSUSE 15.x platform test
|
description: openSUSE 15.x platform test
|
||||||
nodeset: devstack-single-node-opensuse-15
|
nodeset: devstack-single-node-opensuse-15
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: devstack-platform-focal
|
||||||
|
parent: tempest-full-py3
|
||||||
|
description: Ubuntu Focal Fossa platform test
|
||||||
|
nodeset: openstack-single-node-focal
|
||||||
|
vars:
|
||||||
|
tempest_black_regex: "(tempest.api.compute.volumes.test_attach_volume.AttachVolumeMultiAttachTest.test_resize_server_with_multiattached_volume|tempest.api.compute.servers.test_server_rescue_negative.ServerRescueNegativeTestJSON|tempest.api.compute.servers.test_server_rescue.ServerStableDeviceRescueTest.test_stable_device_rescue_disk_virtio_with_volume_attached)"
|
||||||
voting: false
|
voting: false
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
@@ -605,6 +623,7 @@
|
|||||||
- devstack-platform-opensuse-15
|
- devstack-platform-opensuse-15
|
||||||
- devstack-platform-fedora-latest
|
- devstack-platform-fedora-latest
|
||||||
- devstack-platform-centos-8
|
- devstack-platform-centos-8
|
||||||
|
- devstack-platform-focal
|
||||||
- devstack-multinode
|
- devstack-multinode
|
||||||
- devstack-unit-tests
|
- devstack-unit-tests
|
||||||
- openstack-tox-bashate
|
- openstack-tox-bashate
|
||||||
|
@@ -96,10 +96,11 @@ function install_apache_uwsgi {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if is_ubuntu; then
|
if is_ubuntu; then
|
||||||
install_package uwsgi \
|
local pkg_list="uwsgi uwsgi-plugin-python3 libapache2-mod-proxy-uwsgi"
|
||||||
uwsgi-plugin-python \
|
if "$DISTRO" == 'bionic'; then
|
||||||
uwsgi-plugin-python3 \
|
pkg_list="${pkg_list} uwsgi-plugin-python"
|
||||||
libapache2-mod-proxy-uwsgi
|
fi
|
||||||
|
install_package ${pkg_list}
|
||||||
elif is_fedora; then
|
elif is_fedora; then
|
||||||
# Note httpd comes with mod_proxy_uwsgi and it is loaded by
|
# Note httpd comes with mod_proxy_uwsgi and it is loaded by
|
||||||
# default; the mod_proxy_uwsgi package actually conflicts now.
|
# default; the mod_proxy_uwsgi package actually conflicts now.
|
||||||
|
2
stack.sh
2
stack.sh
@@ -221,7 +221,7 @@ write_devstack_version
|
|||||||
|
|
||||||
# Warn users who aren't on an explicitly supported distro, but allow them to
|
# Warn users who aren't on an explicitly supported distro, but allow them to
|
||||||
# override check and attempt installation with ``FORCE=yes ./stack``
|
# override check and attempt installation with ``FORCE=yes ./stack``
|
||||||
if [[ ! ${DISTRO} =~ (bionic|stretch|jessie|f30|f31|opensuse-15.0|opensuse-15.1|opensuse-tumbleweed|rhel8) ]]; then
|
if [[ ! ${DISTRO} =~ (bionic|focal|stretch|jessie|f30|f31|opensuse-15.0|opensuse-15.1|opensuse-tumbleweed|rhel8) ]]; then
|
||||||
echo "WARNING: this script has not been tested on $DISTRO"
|
echo "WARNING: this script has not been tested on $DISTRO"
|
||||||
if [[ "$FORCE" != "yes" ]]; then
|
if [[ "$FORCE" != "yes" ]]; then
|
||||||
die $LINENO "If you wish to run this script anyway run with FORCE=yes"
|
die $LINENO "If you wish to run this script anyway run with FORCE=yes"
|
||||||
|
Reference in New Issue
Block a user