Skip to content

Commit 908a473

Browse files
rbradfordretrage
authored andcommitted
tests: Add groovy integration test
Signed-off-by: Rob Bradford <robert.bradford@intel.com>
1 parent ed52093 commit 908a473

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

fetch_disk_images.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,21 @@ if [ ! -f "$FOCAL_OS_RAW_IMAGE" ]; then
4646
qemu-img convert -p -f qcow2 -O raw $FOCAL_OS_IMAGE_NAME $FOCAL_OS_RAW_IMAGE_NAME
4747
popd
4848
fi
49+
50+
51+
GROOVY_OS_IMAGE_NAME="groovy-server-cloudimg-amd64.img"
52+
GROOVY_OS_IMAGE_URL="https://cloud-images.ubuntu.com/groovy/current/$GROOVY_OS_IMAGE_NAME"
53+
GROOVY_OS_IMAGE="$IMAGES_DIR/$GROOVY_OS_IMAGE_NAME"
54+
if [ ! -f "$GROOVY_OS_IMAGE" ]; then
55+
pushd $IMAGES_DIR
56+
wget --quiet $GROOVY_OS_IMAGE_URL
57+
popd
58+
fi
59+
60+
GROOVY_OS_RAW_IMAGE_NAME="groovy-server-cloudimg-amd64-raw.img"
61+
GROOVY_OS_RAW_IMAGE="$IMAGES_DIR/$GROOVY_OS_RAW_IMAGE_NAME"
62+
if [ ! -f "$GROOVY_OS_RAW_IMAGE" ]; then
63+
pushd $IMAGES_DIR
64+
qemu-img convert -p -f qcow2 -O raw $GROOVY_OS_IMAGE_NAME $GROOVY_OS_RAW_IMAGE_NAME
65+
popd
66+
fi

src/integration.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,7 @@ mod tests {
390390

391391
const BIONIC_IMAGE_NAME: &str = "bionic-server-cloudimg-amd64-raw.img";
392392
const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-amd64-raw.img";
393+
const GROOVY_IMAGE_NAME: &str = "groovy-server-cloudimg-amd64-raw.img";
393394
const CLEAR_IMAGE_NAME: &str = "clear-31311-cloudguest.img";
394395

395396
#[test]
@@ -402,6 +403,11 @@ mod tests {
402403
test_boot(FOCAL_IMAGE_NAME, &UbuntuCloudInit {}, spawn_qemu)
403404
}
404405

406+
#[test]
407+
fn test_boot_qemu_groovy() {
408+
test_boot(GROOVY_IMAGE_NAME, &UbuntuCloudInit {}, spawn_qemu)
409+
}
410+
405411
#[test]
406412
fn test_boot_qemu_clear() {
407413
test_boot(CLEAR_IMAGE_NAME, &ClearCloudInit {}, spawn_qemu)
@@ -419,6 +425,12 @@ mod tests {
419425
test_boot(FOCAL_IMAGE_NAME, &UbuntuCloudInit {}, spawn_ch)
420426
}
421427

428+
#[test]
429+
#[cfg(not(feature = "coreboot"))]
430+
fn test_boot_ch_groovy() {
431+
test_boot(GROOVY_IMAGE_NAME, &UbuntuCloudInit {}, spawn_ch)
432+
}
433+
422434
#[test]
423435
#[cfg(not(feature = "coreboot"))]
424436
fn test_boot_ch_clear() {

0 commit comments

Comments
 (0)