Skip to content

Commit 3d4b9cc

Browse files
committed
test: boot a CirrOS guest image
The Ubuntu cloud image takes several minutes to convert, copy, and boot inside nested virtualization. CirrOS 0.6.3 ships a hybrid GPT disk with an EFI System Partition that boots under stock UEFI firmware in seconds and shrinks the raw guest disk copy to 112 MiB. CirrOS parses its NoCloud metadata as JSON and runs user-data as a shell script rather than through cloud-init. Signed-off-by: Fabian Wiesel <fabian.wiesel@sap.com>
1 parent fe1b2c8 commit 3d4b9cc

7 files changed

Lines changed: 38 additions & 39 deletions

File tree

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
instance-id: test-instance
2-
local-hostname: VM
1+
{
2+
"instance-id": "test-instance",
3+
"local-hostname": "VM"
4+
}
Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
1-
#cloud-config
2-
users:
3-
- name: root
4-
shell: /bin/bash
5-
ssh_authorized_keys:
6-
- "${SSH_KEY}"
7-
hashed_passwd: "${PASSWORD}"
1+
#!/bin/sh
2+
set -eu
83

9-
disable_root: false
10-
11-
network:
12-
version: 2
13-
ethernets:
14-
all-interfaces:
15-
match:
16-
name: "*"
17-
dhcp4: true
18-
dhcp6: true
4+
# CirrOS' NoCloud datasource executes user-data as a shell script; it does not
5+
# run cloud-init. Install the shared test key for the default cirros user.
6+
home=/home/cirros
7+
mkdir -p "$home/.ssh"
8+
printf '%s\n' '${SSH_KEY}' > "$home/.ssh/authorized_keys"
9+
chown -R cirros:cirros "$home/.ssh"
10+
chmod 700 "$home/.ssh"
11+
chmod 600 "$home/.ssh/authorized_keys"
Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: guest
2-
description: Build the Ubuntu test guest and the shared test SSH identity
2+
description: Build the CirrOS test guest and the shared test SSH identity
33
runs:
44
using: "composite"
55
steps:
@@ -13,26 +13,30 @@ runs:
1313
PASSWORD=$(openssl passwd "password")
1414
echo "PASSWORD=$PASSWORD" >> $GITHUB_ENV
1515
16-
- name: Download ubuntu cloud image
16+
- name: Download the CirrOS test image
1717
shell: bash
1818
run: |
19-
wget -q "https://cloud-images.ubuntu.com/minimal/releases/noble/release/ubuntu-24.04-minimal-cloudimg-amd64.img" -O /opt/ubuntu.qcow2
19+
set -Eeuo pipefail
20+
URL="https://download.cirros-cloud.net/0.6.3/cirros-0.6.3-x86_64-disk.img"
21+
SHA256="7d6355852aeb6dbcd191bcda7cd74f1536cfe5cbf8a10495a7283a8396e4b75b"
22+
23+
wget -q "$URL" -O /opt/cirros.qcow2
24+
echo "$SHA256 /opt/cirros.qcow2" | sha256sum -c -
2025
21-
- name: Generate raw ubuntu image for CHV
26+
- name: Generate raw CirrOS image for CHV
2227
shell: bash
2328
run: |
24-
qemu-img convert -p -f qcow2 -O raw /opt/ubuntu.qcow2 /opt/ubuntu.raw
29+
qemu-img convert -p -f qcow2 -O raw /opt/cirros.qcow2 /opt/cirros.raw
2530
26-
- name: Generate ubuntu cloud-init
31+
- name: Generate the CirrOS cloud-init seed
2732
shell: bash
2833
run: |
2934
set -Eeuo pipefail
3035
: "${SSH_KEY:?the shared test SSH key is not set}"
31-
: "${PASSWORD:?the guest password is not set}"
3236
3337
RENDER_DIR=$(mktemp -d)
3438
trap 'rm -rf "$RENDER_DIR"' EXIT
35-
envsubst '${SSH_KEY} ${PASSWORD}' \
39+
envsubst '${SSH_KEY}' \
3640
< ./.github/actions/test/integration/build/user-data \
3741
> "$RENDER_DIR/user-data"
38-
genisoimage -output /opt/ubuntu-cloud-init-ds.iso -volid cidata -joliet -rock ./.github/actions/test/integration/build/meta-data "$RENDER_DIR/user-data"
42+
genisoimage -output /opt/cirros-cloud-init-ds.iso -volid cidata -joliet -rock ./.github/actions/test/integration/build/meta-data "$RENDER_DIR/user-data"

‎.github/actions/test/integration/test/cloudhypervisor/action.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ runs:
1313
IP_HV2="192.168.122.3"
1414
1515
scp ./.github/actions/test/integration/test/cloudhypervisor/vm.xml "$IP_HV1:/opt/vm-chv.xml"
16-
scp /opt/ubuntu.raw "$IP_HV1:/var/lib/libvirt/images/ubuntu.raw"
17-
scp /opt/ubuntu-cloud-init-ds.iso "$IP_HV1:/var/lib/libvirt/images/ubuntu-cloud-init-ds.iso"
16+
scp /opt/cirros.raw "$IP_HV1:/var/lib/libvirt/images/cirros.raw"
17+
scp /opt/cirros-cloud-init-ds.iso "$IP_HV1:/var/lib/libvirt/images/cirros-cloud-init-ds.iso"
1818
1919
# libvirt migration between cloudhypervisor instances does not support storage migration yet
20-
scp /opt/ubuntu.raw "$IP_HV2:/var/lib/libvirt/images/ubuntu.raw"
20+
scp /opt/cirros.raw "$IP_HV2:/var/lib/libvirt/images/cirros.raw"
2121
# the cloud-init data is not migrated from source to destination, but needed for the VM to run at the destination
22-
scp /opt/ubuntu-cloud-init-ds.iso "$IP_HV2:/var/lib/libvirt/images/ubuntu-cloud-init-ds.iso"
22+
scp /opt/cirros-cloud-init-ds.iso "$IP_HV2:/var/lib/libvirt/images/cirros-cloud-init-ds.iso"
2323
2424
- name: Start VM on HyperVisor 1
2525
shell: bash

‎.github/actions/test/integration/test/cloudhypervisor/vm.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<cpu mode='host-passthrough' check='none' migratable='on' />
1111
<devices>
1212
<disk type='file' device='disk'>
13-
<source file='/var/lib/libvirt/images/ubuntu.raw' />
13+
<source file='/var/lib/libvirt/images/cirros.raw' />
1414
<target dev='hda' bus='virtio' />
1515
</disk>
1616
<disk type='file' device='cdrom'>
17-
<source file='/var/lib/libvirt/images/ubuntu-cloud-init-ds.iso' />
17+
<source file='/var/lib/libvirt/images/cirros-cloud-init-ds.iso' />
1818
<target dev='hdb' bus='virtio' />
1919
<readonly />
2020
</disk>

‎.github/actions/test/integration/test/qemu/action.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ runs:
1313
IP_HV2="192.168.122.3"
1414
1515
scp ./.github/actions/test/integration/test/qemu/vm.xml "$IP_HV1:/opt/vm-qemu.xml"
16-
scp /opt/ubuntu.qcow2 "$IP_HV1:/var/lib/libvirt/images/ubuntu.qcow2"
17-
scp /opt/ubuntu-cloud-init-ds.iso "$IP_HV1:/var/lib/libvirt/images/ubuntu-cloud-init-ds.iso"
16+
scp /opt/cirros.qcow2 "$IP_HV1:/var/lib/libvirt/images/cirros.qcow2"
17+
scp /opt/cirros-cloud-init-ds.iso "$IP_HV1:/var/lib/libvirt/images/cirros-cloud-init-ds.iso"
1818
1919
# the cloud-init data is not migrated from source to destination, but needed for the VM to run at the destination
20-
scp /opt/ubuntu-cloud-init-ds.iso "$IP_HV2:/var/lib/libvirt/images/ubuntu-cloud-init-ds.iso"
20+
scp /opt/cirros-cloud-init-ds.iso "$IP_HV2:/var/lib/libvirt/images/cirros-cloud-init-ds.iso"
2121
2222
- name: Start VM on HyperVisor 1
2323
shell: bash

‎.github/actions/test/integration/test/qemu/vm.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
<devices>
1515
<disk type='file' device='disk'>
1616
<driver name='qemu' type='qcow2' />
17-
<source file='/var/lib/libvirt/images/ubuntu.qcow2' />
17+
<source file='/var/lib/libvirt/images/cirros.qcow2' />
1818
<target dev='vda' bus='virtio' />
1919
</disk>
2020
<disk type='file' device='disk'>
2121
<driver name='qemu' type='raw' />
22-
<source file='/var/lib/libvirt/images/ubuntu-cloud-init-ds.iso' />
22+
<source file='/var/lib/libvirt/images/cirros-cloud-init-ds.iso' />
2323
<target dev='vdb' bus='virtio' />
2424
<readonly />
2525
</disk>

0 commit comments

Comments
 (0)