Drop bionic support

drop the support of bionic.
ref:
https://governance.openstack.org/tc/reference/runtimes/zed.html

Change-Id: I6dd126d49196af30bd5578c6aefa90fff9f1d5c1

11 files changed, 31 insertions, 36 deletions

diff --git a/doc/source/admin/building_guest_images.rst b/doc/source/admin/building_guest_images.rst
index 8192b679..f25a1a40 100644
--- a/doc/source/admin/building_guest_images.rst
+++ b/doc/source/admin/building_guest_images.rst
@@ -149,7 +149,7 @@ The trove guest image could be created by running the following command:
         ${guest_username} \
         ${output_image_path}
 
-* Currently, only ``guest_os=ubuntu`` and ``guest_os_release=bionic`` are fully
+* Currently, only ``guest_os=ubuntu`` and ``guest_os_release=focal`` are fully
   tested and supported.
 
 * Default input values:
@@ -157,7 +157,7 @@ The trove guest image could be created by running the following command:
   .. code-block:: ini
 
       guest_os=ubuntu
-      guest_os_release=bionic
+      guest_os_release=focal
       dev_mode=true
       guest_username=ubuntu
       output_image_path=$HOME/images/trove-guest-${guest_os}-${guest_os_release}-dev.qcow2
@@ -182,12 +182,12 @@ The trove guest image could be created by running the following command:
   extension, e.g. to build a raw image, you can specify
   ``$your-image-name.raw`` as the ``output_image_path`` parameter.
 
-For example, in order to build a guest image for Ubuntu Bionic operating
+For example, in order to build a guest image for Ubuntu focal operating
 system in development mode:
 
 .. code-block:: console
 
-    $ ./trovestack build-image ubuntu bionic true ubuntu
+    $ ./trovestack build-image ubuntu focal true ubuntu
 
 Once the image build is finished, the cloud administrator needs to register the
 image in Glance and register a new datastore or version in Trove using
@@ -195,12 +195,12 @@ image in Glance and register a new datastore or version in Trove using
 
 .. code-block:: console
 
-    $ openstack image create trove-guest-ubuntu-bionic \
+    $ openstack image create trove-guest-ubuntu-focal \
       --private \
       --disk-format qcow2 \
       --container-format bare \
       --tag trove --tag mysql \
-      --file ~/images/trove-guest-ubuntu-bionic-dev.qcow2
+      --file ~/images/trove-guest-ubuntu-focal-dev.qcow2
     $ openstack datastore version create 5.7.29 mysql mysql "" \
       --image-tags trove,mysql \
       --active --default
diff --git a/doc/source/admin/datastore.rst b/doc/source/admin/datastore.rst
index ddac4b8d..ad25d302 100644
--- a/doc/source/admin/datastore.rst
+++ b/doc/source/admin/datastore.rst
@@ -59,7 +59,7 @@ To create a datastore version:
    .. code-block:: console
 
       openstack image create \
-        trove-guest-ubuntu-bionic \
+        trove-guest-ubuntu-focal \
         --private \
         --disk-format qcow2 --container-format bare \
         --file $image_file \
diff --git a/doc/source/admin/troubleshooting.rst b/doc/source/admin/troubleshooting.rst
index e4fe5691..78c178cb 100644
--- a/doc/source/admin/troubleshooting.rst
+++ b/doc/source/admin/troubleshooting.rst
@@ -111,7 +111,7 @@ To ssh into the Trove instance, you need to make sure:
   .. code-block:: console
 
      $ openstack server list | grep test | grep trove-mgmt
-     | 810fc014-bd9f-4464-b506-1b78f37c495e | test | ACTIVE | private=10.1.0.57; trove-mgmt=192.168.254.229 | ubuntu-xenial-mysql-5.7-dev | ds1G   |
+     | 810fc014-bd9f-4464-b506-1b78f37c495e | test | ACTIVE | private=10.1.0.57; trove-mgmt=192.168.254.229 | ubuntu-focal-mysql-5.7-dev | ds1G   |
 
 * The TCP 22 port is allowed in the Neutron security group (defined by
   ``management_security_groups`` config option) that applied to the management
diff --git a/doc/source/admin/upgrade.rst b/doc/source/admin/upgrade.rst
index ea4ce1aa..5b72a0b3 100644
--- a/doc/source/admin/upgrade.rst
+++ b/doc/source/admin/upgrade.rst
@@ -118,7 +118,7 @@ Upgrade Trove services
    .. code-block:: console
 
       $ stackdir=/opt/stack
-      $ $stackdir/trove/integration/scripts/trovestack build-image ubuntu bionic true ubuntu
+      $ $stackdir/trove/integration/scripts/trovestack build-image ubuntu focal true ubuntu
 
 #. Trove database migration.
 
@@ -146,7 +146,7 @@ Upgrade Trove services
 
    .. code-block:: console
 
-      $ imageid=$(openstack image create trove-guest-victoria-ubuntu-bionic-dev \
+      $ imageid=$(openstack image create trove-guest-victoria-ubuntu-focal-dev \
           --private \
           --disk-format qcow2 --container-format bare \
           --file ${imagefile-path} \
diff --git a/integration/README.md b/integration/README.md
index 157cc3e6..07e7a91b 100644
--- a/integration/README.md
+++ b/integration/README.md
@@ -2,7 +2,7 @@
 
 ## Steps to setup environment
 
-Install a fresh Ubuntu 16.04 (xenial) image. We suggest creating a development virtual machine using the image.
+Install a fresh Ubuntu 20.04 (focal) image. We suggest creating a development virtual machine using the image.
 
 1. Login to the machine as root
 1. Make sure we have git installed
@@ -137,10 +137,10 @@ PATH_DEVSTACK_OUTPUT=/opt/stack \
 - If `dev_mode=true`, no Trove code is injected into the guest image. The guest
   agent will download Trove code during the service initialization.
 
-For example, build a Mysql image for Ubuntu Xenial operating system:
+For example, build a Mysql image for Ubuntu Focal operating system:
 
 ```shell
-$ ./trovestack build-image mysql ubuntu xenial false
+$ ./trovestack build-image mysql ubuntu focal false
 ```
 
 ### Running Integration Tests
diff --git a/integration/scripts/files/elements/ubuntu-mysql/pre-install.d/10-percona-apt-key b/integration/scripts/files/elements/ubuntu-mysql/pre-install.d/10-percona-apt-key
index 732b9e69..37f85bf8 100755
--- a/integration/scripts/files/elements/ubuntu-mysql/pre-install.d/10-percona-apt-key
+++ b/integration/scripts/files/elements/ubuntu-mysql/pre-install.d/10-percona-apt-key
@@ -7,7 +7,7 @@ set -e
 set -o xtrace
 
 GUEST_USERNAME=${GUEST_USERNAME:-"ubuntu"}
-RELEASE=${DIB_RELEASE:-"xenial"}
+RELEASE=${DIB_RELEASE:-"focal"}
 
 # Add Percona GPG key
 mkdir -p /home/${GUEST_USERNAME}/.gnupg
diff --git a/integration/scripts/functions_qemu b/integration/scripts/functions_qemu
index 3d130684..5cf2f520 100644
--- a/integration/scripts/functions_qemu
+++ b/integration/scripts/functions_qemu
@@ -50,16 +50,6 @@ function build_guest_image() {
     if [[ "${guest_os}" == "ubuntu" ]]; then
         export DIB_RELEASE=${guest_release}
         export DISTRO_NAME="ubuntu"
-        # https://cloud-images.ubuntu.com/releases is more stable than the daily
-        # builds (https://cloud-images.ubuntu.com/xenial/current/),
-        # e.g. sometimes SHA256SUMS file is missing in the daily builds website.
-        # Ref: diskimage_builder/elements/ubuntu/root.d/10-cache-ubuntu-tarball
-        if [[ "${DIB_RELEASE}" != "focal" ]]; then
-          #TODO(wuchunyang): we need remove the support of xenial and bionic.
-          declare -A image_file_mapping=( ["xenial"]="ubuntu-16.04-server-cloudimg-amd64-root.tar.gz" ["bionic"]="ubuntu-18.04-server-cloudimg-amd64.squashfs" )
-          export DIB_CLOUD_IMAGES="https://cloud-images.ubuntu.com/releases/${DIB_RELEASE}/release/"
-          export BASE_IMAGE_FILE=${image_file_mapping[${DIB_RELEASE}]}
-        fi
         elementes="$elementes ubuntu-minimal"
     fi
 
diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack
index e6171a33..886581ec 100755
--- a/integration/scripts/trovestack
+++ b/integration/scripts/trovestack
@@ -732,7 +732,7 @@ function cmd_build_image() {
     exclaim "Params for cmd_build_image function: $@"
 
     local image_guest_os=${1:-'ubuntu'}
-    local image_guest_release=${2:-'bionic'}
+    local image_guest_release=${2:-'focal'}
     local dev_mode=${3:-'true'}
     local guest_username=${4:-'ubuntu'}
     local output=$5
diff --git a/releasenotes/notes/remove-bionic-support-85f506117e566813.yaml b/releasenotes/notes/remove-bionic-support-85f506117e566813.yaml
new file mode 100644
index 00000000..e3fe9d73
--- /dev/null
+++ b/releasenotes/notes/remove-bionic-support-85f506117e566813.yaml
@@ -0,0 +1,5 @@
+---
+
+deprecations:
+  - |
+    The support of Bionic has been removed.
\ No newline at end of file
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 7782e37d..845eb7a7 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -93,7 +93,7 @@
     vars:
       devstack_localrc:
         TROVE_RESIZE_TIME_OUT: 1800
-        TROVE_NON_DEV_IMAGE_URL: https://tarballs.opendev.org/openstack/trove/images/trove-master-mysql-ubuntu-xenial.qcow2
+        TROVE_NON_DEV_IMAGE_URL: https://tarballs.opendev.org/openstack/trove/images/trove-master-mysql-ubuntu-focal.qcow2
       trove_resize_time_out: 1800
       trove_test_datastore: 'mysql'
       trove_test_group: 'mysql'
@@ -415,7 +415,7 @@
     run: playbooks/image-build/run.yaml
     nodeset: trove-ubuntu-focal-single
     description: |
-      Build Ubuntu Bionic based image only on ubuntu distro.
+      Build Ubuntu focal based image only on ubuntu distro.
     required-projects:
       - openstack/diskimage-builder
       - openstack/trove
@@ -435,7 +435,7 @@
     run: playbooks/image-build/run.yaml
     nodeset: trove-centos8s-single
     description: |
-      Build Ubuntu Bionic based image only on centos8 stream.
+      Build Ubuntu focal based image only on centos8 stream.
     required-projects:
       - openstack/diskimage-builder
       - openstack/trove
@@ -451,28 +451,28 @@
       image_suffix: ""
 
 - job:
-    name: publish-trove-guest-image-ubuntu-bionic
+    name: publish-trove-guest-image-ubuntu-focal
     parent: publish-trove-guest-image
     description: |
-      Build and publish Ubuntu Bionic based Trove guest image to
+      Build and publish Ubuntu focal based Trove guest image to
       tarballs.openstack.org.
     vars:
       guest_os: ubuntu
-      guest_os_release: bionic
+      guest_os_release: focal
       guest_username: ubuntu
       branch: master
       dev_mode: false
       image_suffix: ""
 
 - job:
-    name: publish-trove-guest-image-ubuntu-bionic-dev
+    name: publish-trove-guest-image-ubuntu-focal-dev
     parent: publish-trove-guest-image
     description: |
-      Build and publish Ubuntu Bionic based Trove guest image to
+      Build and publish Ubuntu focal based Trove guest image to
       tarballs.openstack.org.
     vars:
       guest_os: ubuntu
-      guest_os_release: bionic
+      guest_os_release: focal
       guest_username: ubuntu
       branch: master
       dev_mode: true
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 672fe3c3..32e5aa1e 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -40,5 +40,5 @@
         - trove-scenario-mariadb-multi
     periodic:
       jobs:
-        - publish-trove-guest-image-ubuntu-bionic
-        - publish-trove-guest-image-ubuntu-bionic-dev
\ No newline at end of file
+        - publish-trove-guest-image-ubuntu-focal
+        - publish-trove-guest-image-ubuntu-focal-dev
\ No newline at end of file