Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ubuntu-core-initramfs: change name of plymouth plugin and move CI to noble #230

Merged
merged 6 commits into from
Feb 7, 2024
Merged

ubuntu-core-initramfs: change name of plymouth plugin and move CI to noble #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c52559b
ubuntu-core-initramfs: change name of plymouth plugin
alfonsosanchezbeato Feb 5, 2024
dbc53b0
spread: use now available 24.04 image
alfonsosanchezbeato Feb 6, 2024
f719cad
tests/lib: adapt to new OVMF paths on 24.04
alfonsosanchezbeato Feb 6, 2024
c64a3f0
snakeoil: update OVMF_VARS to qemu format in noble
alfonsosanchezbeato Feb 6, 2024
717aa91
tests/lib: use now channel 24 for pc-kernel
alfonsosanchezbeato Feb 6, 2024
431aa2e
tests/lib/prepare-utils.sh: make tweaks script more robust
alfonsosanchezbeato Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/ubuntu-core-initramfs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ def install_misc(dest_dir):
"/usr/bin/partx",
"/usr/bin/plymouth",
"/usr/bin/unsquashfs",
"/usr/lib/" + deb_arch + "/plymouth/label-ft.so",
"/usr/lib/" + deb_arch + "/plymouth/label-freetype.so",
"/usr/lib/" + deb_arch + "/plymouth/script.so",
"/usr/lib/" + deb_arch + "/plymouth/two-step.so",
"/usr/sbin/depmod",
Expand All @@ -446,7 +446,7 @@ def install_misc(dest_dir):
proc_env = os.environ.copy()
proc_env["LD_PRELOAD"] = ""
to_resolve = [
"/usr/lib/" + deb_arch + "/plymouth/label-ft.so",
"/usr/lib/" + deb_arch + "/plymouth/label-freetype.so",
"/usr/lib/" + deb_arch + "/plymouth/script.so",
"/usr/lib/" + deb_arch + "/plymouth/two-step.so",
]
Expand Down
Binary file removed snakeoil/OVMF_VARS.snakeoil.fd
View file
Open in desktop
Binary file not shown.
Binary file added snakeoil/OVMF_VARS_4M.snakeoil.fd
View file
Open in desktop
Binary file not shown.
3 changes: 1 addition & 2 deletions spread.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ backends:
halt-timeout: 2h
systems:
- ubuntu-24.04-64:
# FIXME: switch to 24.04
image: ubuntu-23.10-64
image: ubuntu-24.04-64
storage: 20G

qemu-nested:
Expand Down
4 changes: 2 additions & 2 deletions tests/lib/nested.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ start_nested_core_vm_unit(){
fi

mkdir -p "${WORK_DIR}/image/"
cp -f "${OVMF_VARS_D}/OVMF_VARS${OVMF_VARS}.fd" "${WORK_DIR}/image/OVMF_VARS${OVMF_VARS}.fd"
PARAM_BIOS="-drive file=/usr/share/OVMF/OVMF_CODE${OVMF_CODE}.fd,if=pflash,format=raw,unit=0,readonly=on -drive file=${WORK_DIR}/image/OVMF_VARS${OVMF_VARS}.fd,if=pflash,format=raw"
cp -f "${OVMF_VARS_D}/OVMF_VARS_4M${OVMF_VARS}.fd" "${WORK_DIR}/image/OVMF_VARS_4M${OVMF_VARS}.fd"
PARAM_BIOS="-drive file=/usr/share/OVMF/OVMF_CODE_4M${OVMF_CODE}.fd,if=pflash,format=raw,unit=0,readonly=on -drive file=${WORK_DIR}/image/OVMF_VARS_4M${OVMF_VARS}.fd,if=pflash,format=raw"
PARAM_MACHINE="-machine q35${ATTR_KVM} -global ICH9-LPC.disable_s3=1"

# Unfortunately the test-snapd-swtpm snap does not work correctly in lxd
Expand Down
10 changes: 5 additions & 5 deletions tests/lib/prepare-utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ start_snapd_core_vm() {
fi

mkdir -p "${work_dir}/image/"
cp -f "/usr/share/OVMF/OVMF_VARS.fd" "${work_dir}/image/OVMF_VARS.fd"
PARAM_BIOS="-drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on -drive file=${work_dir}/image/OVMF_VARS.fd,if=pflash,format=raw"
cp -f "/usr/share/OVMF/OVMF_VARS_4M.fd" "${work_dir}/image/OVMF_VARS_4M.fd"
PARAM_BIOS="-drive file=/usr/share/OVMF/OVMF_CODE_4M.fd,if=pflash,format=raw,unit=0,readonly=on -drive file=${work_dir}/image/OVMF_VARS_4M.fd,if=pflash,format=raw"
PARAM_MACHINE="-machine q35${ATTR_KVM} -global ICH9-LPC.disable_s3=1"
PARAM_IMAGE="-drive file=${work_dir}/pc.img,cache=none,format=raw,id=disk1,if=none -device virtio-blk-pci,drive=disk1,bootindex=1"

Expand Down Expand Up @@ -152,8 +152,7 @@ download_core_initrd_snaps() {
curl -o ubuntu-core-amd64-dangerous.model https://raw.githubusercontent.com/snapcore/models/master/ubuntu-core-24-amd64-dangerous.model

# download neccessary images
# FIXME: switch to 24/ channel
snap download pc-kernel --channel=22/${snap_branch} --basename=upstream-pc-kernel
snap download pc-kernel --channel=24/${snap_branch} --basename=upstream-pc-kernel
snap download pc --channel=24/${snap_branch} --basename=upstream-pc-gadget
snap download snapd --channel=${snap_branch} --basename=upstream-snapd
snap download core24 --channel=${snap_branch} --basename=upstream-core24
Expand Down Expand Up @@ -327,7 +326,8 @@ echo 'ubuntu ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/99-ubuntu-user
sed -i 's/\#\?\(PermitRootLogin\|PasswordAuthentication\)\>.*/\1 yes/' /etc/ssh/sshd_config
echo "MaxAuthTries 120" >> /etc/ssh/sshd_config
grep '^PermitRootLogin yes' /etc/ssh/sshd_config
systemctl reload ssh
# ssh might not be active yet so the command might fail
systemctl reload ssh || true

print_system "done setting up ssh for spread test user"

Expand Down
Loading