Drop bionic support

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

Change-Id: I6dd126d49196af30bd5578c6aefa90fff9f1d5c1

4 files changed, 5 insertions, 15 deletions

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