diff options
| author | Zuul <zuul@review.opendev.org> | 2022-04-21 15:04:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-04-21 15:04:45 +0000 |
| commit | 8182e3d93aec52c9bd551b0ccb1539aae2abd0c4 (patch) | |
| tree | 577907cbd3b69b32062375c79a6f6c02d1eb7c07 | |
| parent | a2cab97cc951adbafe10c26a8ebe4f7c8dfd68df (diff) | |
| parent | 2f8f2f8d92875ca77b55c2d76416913b7b92fce8 (diff) | |
| download | trove-8182e3d93aec52c9bd551b0ccb1539aae2abd0c4.tar.gz | |
Merge "Add ubuntu focal support for trove guest image"
| -rw-r--r-- | integration/scripts/files/elements/guest-agent/pkg-map | 7 | ||||
| -rw-r--r-- | integration/scripts/functions_qemu | 9 | ||||
| -rwxr-xr-x | integration/scripts/trovestack | 2 | ||||
| -rw-r--r-- | zuul.d/jobs.yaml | 4 |
4 files changed, 16 insertions, 6 deletions
diff --git a/integration/scripts/files/elements/guest-agent/pkg-map b/integration/scripts/files/elements/guest-agent/pkg-map index 69c07900..64d8b068 100644 --- a/integration/scripts/files/elements/guest-agent/pkg-map +++ b/integration/scripts/files/elements/guest-agent/pkg-map @@ -1,4 +1,11 @@ { + "release": { + "ubuntu": { + "focal": { + "ureadahead": "" + } + } + }, "family": { "redhat": { "guest-agent": "openstack-trove-guest-agent", diff --git a/integration/scripts/functions_qemu b/integration/scripts/functions_qemu index bd0bedbb..5995a904 100644 --- a/integration/scripts/functions_qemu +++ b/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 diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack index 3e50194f..e6171a33 100755 --- a/integration/scripts/trovestack +++ b/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"} diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 4529eda9..7782e37d 100644 --- a/zuul.d/jobs.yaml +++ b/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 |