diff --git a/.zuul.yaml b/.zuul.yaml index 00129b5ca4..b65aeec4dd 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -584,16 +584,6 @@ voting: false timeout: 9000 -- job: - name: devstack-platform-bionic - parent: tempest-full-py3 - description: Ubuntu Bionic platform test - nodeset: openstack-single-node-bionic - voting: false - vars: - devstack_localrc: - CINDER_ISCSI_HELPER: tgtadm - - job: name: devstack-async parent: tempest-full-py3 @@ -695,7 +685,6 @@ - devstack-ipv6 - devstack-platform-fedora-latest - devstack-platform-centos-8 - - devstack-platform-bionic - devstack-async - devstack-multinode - devstack-unit-tests diff --git a/lib/apache b/lib/apache index 870a65a9d2..04259ba31f 100644 --- a/lib/apache +++ b/lib/apache @@ -93,9 +93,6 @@ function install_apache_uwsgi { if is_ubuntu; then local pkg_list="uwsgi uwsgi-plugin-python3 libapache2-mod-proxy-uwsgi" - if [[ "$DISTRO" == 'bionic' ]]; then - pkg_list="${pkg_list} uwsgi-plugin-python" - fi install_package ${pkg_list} elif is_fedora; then # Note httpd comes with mod_proxy_uwsgi and it is loaded by diff --git a/lib/cinder b/lib/cinder index cfa3693f03..e076d53ac7 100644 --- a/lib/cinder +++ b/lib/cinder @@ -91,12 +91,6 @@ CINDER_VOLUME_CLEAR=$(echo ${CINDER_VOLUME_CLEAR} | tr '[:upper:]' '[:lower:]') # Default to lioadm CINDER_ISCSI_HELPER=${CINDER_ISCSI_HELPER:-lioadm} -# Bionic needs to default to tgtadm until support is dropped within devstack -# as the rtslib-fb-targetctl service doesn't start after installing lioadm. -if is_ubuntu && [[ "$DISTRO" == "bionic" ]]; then - CINDER_ISCSI_HELPER=tgtadm -fi - # EL and SUSE should only use lioadm if is_fedora || is_suse; then if [[ ${CINDER_ISCSI_HELPER} != "lioadm" ]]; then diff --git a/stack.sh b/stack.sh index 163fc5b370..6858ab8c42 100755 --- a/stack.sh +++ b/stack.sh @@ -227,7 +227,7 @@ write_devstack_version # Warn users who aren't on an explicitly supported distro, but allow them to # override check and attempt installation with ``FORCE=yes ./stack`` -SUPPORTED_DISTROS="bionic|focal|f31|f32|opensuse-15.2|opensuse-tumbleweed|rhel8" +SUPPORTED_DISTROS="focal|f31|f32|opensuse-15.2|opensuse-tumbleweed|rhel8" if [[ ! ${DISTRO} =~ $SUPPORTED_DISTROS ]]; then echo "WARNING: this script has not been tested on $DISTRO" diff --git a/tools/fixup_stuff.sh b/tools/fixup_stuff.sh index 25f726892f..19219435ad 100755 --- a/tools/fixup_stuff.sh +++ b/tools/fixup_stuff.sh @@ -59,43 +59,6 @@ function fixup_keystone { fi } -# Ubuntu Repositories -#-------------------- -# Enable universe for bionic since it is missing when installing from ISO. -function fixup_ubuntu { - if [[ "$DISTRO" != "bionic" ]]; then - return - fi - - # This pulls in apt-add-repository - install_package "software-properties-common" - - # Enable universe - sudo add-apt-repository -y universe - - if [[ -f /etc/ci/mirror_info.sh ]] ; then - # If we are on a nodepool provided host and it has told us about - # where we can find local mirrors then use that mirror. - source /etc/ci/mirror_info.sh - sudo apt-add-repository -y "deb $NODEPOOL_UCA_MIRROR bionic-updates/ussuri main" - else - # Enable UCA:ussuri for updated versions of QEMU and libvirt - sudo add-apt-repository -y cloud-archive:ussuri - fi - REPOS_UPDATED=False - apt_get_update - - # Since pip10, pip will refuse to uninstall files from packages - # that were created with distutils (rather than more modern - # setuptools). This is because it technically doesn't have a - # manifest of what to remove. However, in most cases, simply - # overwriting works. So this hacks around those packages that - # have been dragged in by some other system dependency - sudo rm -rf /usr/lib/python3/dist-packages/httplib2-*.egg-info - sudo rm -rf /usr/lib/python3/dist-packages/pyasn1_modules-*.egg-info - sudo rm -rf /usr/lib/python3/dist-packages/PyYAML-*.egg-info -} - # Python Packages # --------------- @@ -194,7 +157,6 @@ function fixup_ovn_centos { function fixup_all { fixup_keystone - fixup_ubuntu fixup_fedora fixup_suse }