File tree Expand file tree Collapse file tree 3 files changed +25
-5
lines changed
Expand file tree Collapse file tree 3 files changed +25
-5
lines changed Original file line number Diff line number Diff line change 88 nodes :
99 - controller
1010
11+ - nodeset :
12+ name : openstack-single-node-focal
13+ nodes :
14+ - name : controller
15+ label : ubuntu-focal
16+ groups :
17+ - name : tempest
18+ nodes :
19+ - controller
20+
1121- nodeset :
1222 name : openstack-single-node-bionic
1323 nodes :
512522 parent : tempest-full-py3
513523 description : openSUSE 15.x platform test
514524 nodeset : devstack-single-node-opensuse-15
525+
526+ - job :
527+ name : devstack-platform-focal
528+ parent : tempest-full-py3
529+ description : Ubuntu Focal Fossa platform test
530+ nodeset : openstack-single-node-focal
531+ vars :
532+ 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)"
515533 voting : false
516534
517535- job :
605623 - devstack-platform-opensuse-15
606624 - devstack-platform-fedora-latest
607625 - devstack-platform-centos-8
626+ - devstack-platform-focal
608627 - devstack-multinode
609628 - devstack-unit-tests
610629 - openstack-tox-bashate
Original file line number Diff line number Diff line change @@ -96,10 +96,11 @@ function install_apache_uwsgi {
9696 fi
9797
9898 if is_ubuntu; then
99- install_package uwsgi \
100- uwsgi-plugin-python \
101- uwsgi-plugin-python3 \
102- libapache2-mod-proxy-uwsgi
99+ local pkg_list=" uwsgi uwsgi-plugin-python3 libapache2-mod-proxy-uwsgi"
100+ if " $DISTRO " == ' bionic' ; then
101+ pkg_list=" ${pkg_list} uwsgi-plugin-python"
102+ fi
103+ install_package ${pkg_list}
103104 elif is_fedora; then
104105 # Note httpd comes with mod_proxy_uwsgi and it is loaded by
105106 # default; the mod_proxy_uwsgi package actually conflicts now.
Original file line number Diff line number Diff line change @@ -221,7 +221,7 @@ write_devstack_version
221221
222222# Warn users who aren't on an explicitly supported distro, but allow them to
223223# override check and attempt installation with ``FORCE=yes ./stack``
224- if [[ ! ${DISTRO} =~ (bionic| stretch| jessie| f30| f31| opensuse-15.0| opensuse-15.1| opensuse-tumbleweed| rhel8) ]]; then
224+ if [[ ! ${DISTRO} =~ (bionic| focal | stretch| jessie| f30| f31| opensuse-15.0| opensuse-15.1| opensuse-tumbleweed| rhel8) ]]; then
225225 echo " WARNING: this script has not been tested on $DISTRO "
226226 if [[ " $FORCE " != " yes" ]]; then
227227 die $LINENO " If you wish to run this script anyway run with FORCE=yes"
You can’t perform that action at this time.
0 commit comments