Merge "Add ubuntu focal support for trove guest image"

integration/scripts/files/elements/guest-agent/pkg-map

@@ -1,4 +1,11 @@
 {
+  "release": {
+    "ubuntu": {
+      "focal": {
+        "ureadahead": ""
+        }
+      }
+    },
   "family": {
     "redhat": {
       "guest-agent": "openstack-trove-guest-agent",

integration/scripts/functions_qemu

@@ -54,9 +54,12 @@ function build_guest_image() {
         # 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
-        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}]}
+        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
 

integration/scripts/trovestack

@@ -767,7 +767,7 @@ function cmd_build_image() {
 # Build guest image and upload to Glance, register the datastore and configuration parameters.
 function cmd_build_and_upload_image() {
     local guest_os=${1:-"ubuntu"}
-    local guest_release=${2:-"bionic"}
+    local guest_release=${2:-"focal"}
     local dev_mode=${3:-"true"}
     local guest_username=${4:-"ubuntu"}
     local output_dir=${5:-"$HOME/images"}

zuul.d/jobs.yaml

@@ -424,7 +424,7 @@
       - ^integration/(scripts|tests)/
     vars:
       guest_os: ubuntu
-      guest_os_release: bionic
+      guest_os_release: focal
       guest_username: ubuntu
       branch: master
       dev_mode: false
@@ -444,7 +444,7 @@
       - ^integration/(scripts|tests)/
     vars:
       guest_os: ubuntu
-      guest_os_release: bionic
+      guest_os_release: focal
       guest_username: ubuntu
       branch: master
       dev_mode: false