lukechilds
/
mender-convert
mirror of https://github.com/lukechilds/mender-convert.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

chore: Update Ubuntu test image to Jammy distribution 

Ticket: QA-554

Signed-off-by: Lluis Campos <lluis.campos@northern.tech>
master
Lluis Campos 2 years ago
committed by Kristian Amlie
parent
5a68cecb3a
commit
c9b9106e00
No known key found for this signature in database GPG Key ID: F464407C996AF03F
3 changed files with 20 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      configs/ubuntu-qemux86-64_config
  2. 16
      scripts/test/generate-image.sh
  3. 14
      scripts/test/run-tests.sh

4
configs/ubuntu-qemux86-64_config
View File

@ -8,11 +8,11 @@
# #
# Locally, converted with the following command: # Locally, converted with the following command:
# #
# MENDER_ARTIFACT_NAME=release-1 ./docker-mender-convert --disk-image input/Ubuntu-Focal-x86-64.img --overlay rootfs_overlay_demo --config configs/qemux86-64_config # MENDER_ARTIFACT_NAME=release-1 ./docker-mender-convert --disk-image input/Ubuntu-Jammy-x86-64.img --config configs/ubuntu-qemux86-64_config
# #
# and qemu is executed with the following command: # and qemu is executed with the following command:
# #
# qemu-system-x86_64 -enable-kvm -m 512 -smp 2 -bios /usr/share/OVMF/OVMF_CODE.fd -drive format=raw,file=deploy/Ubuntu-Focal-x86-64-qemux86-64-mender.img # qemu-system-x86_64 -enable-kvm -m 512 -smp 2 -bios /usr/share/OVMF/OVMF_CODE.fd -drive format=raw,file=deploy/Ubuntu-Jammy-x86-64-qemux86-64-mender.img
MENDER_STORAGE_DEVICE_BASE=/dev/sda MENDER_STORAGE_DEVICE_BASE=/dev/sda
MENDER_DEVICE_TYPE="qemux86-64" MENDER_DEVICE_TYPE="qemux86-64"

16
scripts/test/generate-image.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Copyright 2022 Northern.tech AS # Copyright 2023 Northern.tech AS
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -26,6 +26,12 @@ if [ "$UID" -ne 0 ]; then
exec sudo "$0" "$@" exec sudo "$0" "$@"
fi fi
DEBIAN_CODENAME="bullseye"
DEBIAN_IMAGE_ID="Debian-11"
UBUNTU_CODENAME="jammy"
UBUNTU_IMAGE_ID="Ubuntu-Jammy"
while [ -n "$1" ]; do while [ -n "$1" ]; do
case "$1" in case "$1" in
"ubuntu") "ubuntu")
@ -53,9 +59,9 @@ cleanup_losetup() {
} }
generate_debian() { generate_debian() {
local -r image="Debian-11-x86-64.img" local -r image="${DEBIAN_IMAGE_ID}-x86-64.img"
mkosi --root-size=2G --distribution=debian --release=bullseye --format=gpt_ext4 --bootable --checksum \ mkosi --root-size=2G --distribution=debian --release="$DEBIAN_CODENAME" --format=gpt_ext4 --bootable --checksum \
--password password --package=openssh-server,dhcpcd5 --package grub-efi-amd64-signed \ --password password --package=openssh-server,dhcpcd5 --package grub-efi-amd64-signed \
--package shim-signed --package lsb-release --output="$image" build --package shim-signed --package lsb-release --output="$image" build
@ -65,9 +71,9 @@ generate_debian() {
} }
generate_ubuntu() { generate_ubuntu() {
local -r image="Ubuntu-Focal-x86-64.img" local -r image="${UBUNTU_IMAGE_ID}-x86-64.img"
mkosi --root-size=2G --distribution=ubuntu --release=focal --format=gpt_ext4 --bootable --checksum \ mkosi --root-size=2G --distribution=ubuntu --release="$UBUNTU_CODENAME" --format=gpt_ext4 --bootable --checksum \
--password password --package=openssh-server,dhcpcd5 --package grub-efi-amd64-signed \ --password password --package=openssh-server,dhcpcd5 --package grub-efi-amd64-signed \
--package shim-signed --package lsb-release --output="$image" build --package shim-signed --package lsb-release --output="$image" build

14
scripts/test/run-tests.sh
View File

@ -38,7 +38,7 @@ BBB_DEBIAN_EMMC_IMAGE_URL="https://rcn-ee.com/rootfs/bb.org/testing/2022-03-02/b
## Auto-update ## Auto-update
RASPBIAN_IMAGE_URL="https://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2022-09-26/2022-09-22-raspios-bullseye-armhf-lite.img.xz" RASPBIAN_IMAGE_URL="https://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2022-09-26/2022-09-22-raspios-bullseye-armhf-lite.img.xz"
UBUNTU_IMAGE_URL="https://downloads.mender.io/mender-convert/images/Ubuntu-Focal-x86-64.img.gz" UBUNTU_IMAGE_URL="https://downloads.mender.io/mender-convert/images/Ubuntu-Jammy-x86-64.img.gz"
DEBIAN_IMAGE_URL="https://downloads.mender.io/mender-convert/images/Debian-11-x86-64.img.gz" DEBIAN_IMAGE_URL="https://downloads.mender.io/mender-convert/images/Debian-11-x86-64.img.gz"
@ -109,7 +109,7 @@ else
sudo cp -r "tests/ssh-public-key-overlay" "input/tests/" sudo cp -r "tests/ssh-public-key-overlay" "input/tests/"
convert_and_test "qemux86-64" \ convert_and_test "qemux86-64" \
"release-1" \ "release-1" \
"input/image/Ubuntu-Focal-x86-64.img.gz" \ "input/image/Ubuntu-Jammy-x86-64.img.gz" \
"--overlay input/tests/ssh-public-key-overlay" \ "--overlay input/tests/ssh-public-key-overlay" \
"--config configs/ubuntu-qemux86-64_config $EXTRA_CONFIG" \ "--config configs/ubuntu-qemux86-64_config $EXTRA_CONFIG" \
"--" \ "--" \
@ -120,13 +120,13 @@ else
echo >&2 "Running the uncompressed test" echo >&2 "Running the uncompressed test"
echo >&2 "----------------------------------------" echo >&2 "----------------------------------------"
rm -rf deploy rm -rf deploy
gunzip --force "input/image/Ubuntu-Focal-x86-64.img.gz" gunzip --force "input/image/Ubuntu-Jammy-x86-64.img.gz"
run_convert "release-2" \ run_convert "release-2" \
"input/image/Ubuntu-Focal-x86-64.img" \ "input/image/Ubuntu-Jammy-x86-64.img" \
"--config configs/ubuntu-qemux86-64_config $EXTRA_CONFIG" || test_result=$? "--config configs/ubuntu-qemux86-64_config $EXTRA_CONFIG" || test_result=$?
ret=0 ret=0
test -f deploy/Ubuntu-Focal-x86-64-qemux86-64-mender.img || ret=$? test -f deploy/Ubuntu-Jammy-x86-64-qemux86-64-mender.img || ret=$?
assert "${ret}" "0" "Expected uncompressed file deploy/Ubuntu-Focal-x86-64-qemux86-64-mender.img" assert "${ret}" "0" "Expected uncompressed file deploy/Ubuntu-Jammy-x86-64-qemux86-64-mender.img"
fi fi
if [ "$TEST_ALL" == "1" -o "$TEST_PLATFORM" == "ubuntu-qemux86-64-no-grub-d" ]; then if [ "$TEST_ALL" == "1" -o "$TEST_PLATFORM" == "ubuntu-qemux86-64-no-grub-d" ]; then
@ -137,7 +137,7 @@ else
convert_and_test \ convert_and_test \
"qemux86-64" \ "qemux86-64" \
"release-1" \ "release-1" \
"input/image/Ubuntu-Focal-x86-64.img.gz" \ "input/image/Ubuntu-Jammy-x86-64.img.gz" \
"--overlay input/tests/ssh-public-key-overlay" \ "--overlay input/tests/ssh-public-key-overlay" \
"--config configs/ubuntu-qemux86-64_config" \ "--config configs/ubuntu-qemux86-64_config" \
"--config configs/testing/no-grub.d_config $EXTRA_CONFIG" \ "--config configs/testing/no-grub.d_config $EXTRA_CONFIG" \

Write Preview
Loading…
Cancel
Save