include msdos image for tests, and use curl over wget

This commit is contained in:
Fabian 2025-06-11 21:07:19 +07:00
parent 8feebbb5cb
commit fff0df6665
3 changed files with 2 additions and 4 deletions

View file

@ -95,7 +95,7 @@ jobs:
- name: Download uncached images - name: Download uncached images
if: steps.cache-images.outputs.cache-hit != 'true' if: steps.cache-images.outputs.cache-hit != 'true'
run: wget -nv -P images/ https://i.copy.sh/{linux.iso,linux3.iso,linux4.iso,buildroot-bzimage68.bin,TinyCore-11.0.iso,oberon.img,msdos.img,openbsd-floppy.img,kolibri.img,windows101.img,os8.img,freedos722.img,mobius-fd-release5.img} run: mkdir -p images && curl --compressed --output-dir images --remote-name-all https://i.copy.sh/{linux.iso,linux3.iso,linux4.iso,buildroot-bzimage68.bin,TinyCore-11.0.iso,oberon.img,msdos.img,openbsd-floppy.img,kolibri.img,windows101.img,os8.img,freedos722.img,mobius-fd-release5.img,msdos622.img}
- name: Run api-tests - name: Run api-tests
run: make api-tests run: make api-tests

View file

@ -148,7 +148,7 @@ for a full setup on Debian or
The disk images for testing are not included in this repository. You can The disk images for testing are not included in this repository. You can
download them directly from the website using: download them directly from the website using:
`wget -P images/ https://i.copy.sh/{linux3.iso,linux.iso,linux4.iso,buildroot-bzimage68.bin,openbsd-floppy.img,kolibri.img,windows101.img,os8.img,freedos722.img}` `curl --compressed --output-dir images/ --remote-name-all https://i.copy.sh/{linux.iso,linux3.iso,linux4.iso,buildroot-bzimage68.bin,TinyCore-11.0.iso,oberon.img,msdos.img,openbsd-floppy.img,kolibri.img,windows101.img,os8.img,freedos722.img,mobius-fd-release5.img,msdos622.img}`
Run integration tests: `make tests` Run integration tests: `make tests`

View file

@ -280,7 +280,6 @@ if(cluster.isPrimary)
}, },
{ {
name: "MS-DOS", name: "MS-DOS",
skip_if_disk_image_missing: true,
hda: root_path + "/images/msdos.img", hda: root_path + "/images/msdos.img",
timeout: 90, timeout: 90,
expected_texts: [ expected_texts: [
@ -289,7 +288,6 @@ if(cluster.isPrimary)
}, },
{ {
name: "MS-DOS (hard disk + floppy disk)", name: "MS-DOS (hard disk + floppy disk)",
skip_if_disk_image_missing: true,
hda: root_path + "/images/msdos.img", hda: root_path + "/images/msdos.img",
fda: root_path + "/images/kolibri.img", fda: root_path + "/images/kolibri.img",
boot_order: 0x132, boot_order: 0x132,