Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,13 @@ jobs:
# Asciinema lets us record the VM text console.
sudo apt-get install -y ovmf asciinema
- name: Run (only) installer test with nvme block device
timeout-minutes: 15
run: |
#!/bin/bash
./run_tests.sh --blockdev-type nvme --no-self-test

- name: Run full self test with virtio block device
timeout-minutes: 15
run: |
#!/bin/bash
./run_tests.sh
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,13 @@ jobs:
# Asciinema lets us record the VM text console.
sudo apt-get install -y ovmf asciinema
- name: Run (only) installer test with nvme block device
timeout-minutes: 15
run: |
#!/bin/bash
./run_tests.sh --blockdev-type nvme --no-self-test

- name: Run full self test with virtio block device
timeout-minutes: 15
run: |
#!/bin/bash
./run_tests.sh
Expand Down
2 changes: 2 additions & 0 deletions mkosi.images/initrd/mkosi.extra/usr/lib/mangos/mangos-install
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ partition_device_name() {
esac
}

install_target="$(readlink -f "${install_target}")"

${echo} /usr/lib/systemd/systemd-pull --force --verify=no --roothash=no --verity=no --direct raw "file://${rootimg}" "$(partition_device_name "${install_target}" 5)"

# Extract partition UUID and set partition name from the filename.
Expand Down
6 changes: 3 additions & 3 deletions run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ then
usage
fi

install_target="/dev/vdb"
install_target=/dev/disk/by-id/virtio-persistent

eval set -- "${args}"
while true
Expand All @@ -101,10 +101,10 @@ do
--blockdev-type)
case "$2" in
virtio-blk-pci)
install_target=/dev/vdb
install_target=/dev/disk/by-id/virtio-persistent
;;
nvme)
install_target=/dev/nvme1n1
install_target=/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_persistent
;;
*)
echo "Invalid block device type: $2" >&2
Expand Down