Skip to content

Commit 51bc015

Browse files
committed
mantle/kola: use /var/ instead of /mnt/workdir-tmp for iscsi test
`/mnt/workdir-tmp/` is something that is mounted in when you run `cosa run`. Using that path here might cause confusion making people think there is some magical mount happening in the backend. Let's just use `/var/` instead to make it less confusing.
1 parent ef9af80 commit 51bc015

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

mantle/cmd/kola/resources/iscsi_butane_setup.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ storage:
5252
"
5353
# Will return 0 if the discovery yield a valid portal
5454
iscsiadm -m discovery -p 127.0.0.1 -t st | grep iqn.2023-10.coreos.target.vm:coreos
55-
- path: /mnt/workdir-tmp/boot.ipxe
55+
- path: /var/boot.ipxe
5656
mode: 0644
5757
contents:
5858
inline: |
@@ -75,7 +75,7 @@ storage:
7575
/dev/disk/by-path/ip-127.0.0.1\:3260-iscsi-iqn.2023-10.coreos.target.vm\:coreos-lun-0 \
7676
--append-karg rd.iscsi.firmware=1 --append-karg ip=ibft \
7777
--console ttyS0,115200n8 \
78-
-i /mnt/workdir-tmp/nested-ign.json
78+
-i /var/nested-ign.json
7979
# Unmount the disk
8080
iscsiadm --mode node --logoutall=all
8181
- path: /etc/containers/systemd/coreos-iscsi-vm.container
@@ -90,12 +90,12 @@ storage:
9090
[Container]
9191
Image=quay.io/coreos-assembler/coreos-assembler
9292
ContainerName=iscsiboot
93-
Volume=/mnt/workdir-tmp/:/mnt/workdir-tmp/
93+
Volume=/var/boot.ipxe:/var/boot.ipxe
9494
Volume=/dev/virtio-ports/testisocompletion:/mnt/serial
9595
PodmanArgs=--privileged
9696
Network=host
9797
LogDriver=passthrough
98-
Exec=shell -- kola qemuexec --netboot /mnt/workdir-tmp/boot.ipxe --usernet-addr 10.0.3.0/24 -- -device virtio-serial -chardev file,id=iscsi-completion-virtio,path=/mnt/serial,append=on -device virtserialport,chardev=iscsi-completion-virtio,name=testisocompletion
98+
Exec=shell -- kola qemuexec --netboot /var/boot.ipxe --usernet-addr 10.0.3.0/24 -- -device virtio-serial -chardev file,id=iscsi-completion-virtio,path=/mnt/serial,append=on -device virtserialport,chardev=iscsi-completion-virtio,name=testisocompletion
9999
[Install]
100100
# Start by default on boot
101101
WantedBy=multi-user.target
@@ -105,7 +105,7 @@ storage:
105105
# Pipe the logs to a virtio port so kola saves them
106106
StandardError=inherit
107107
StandardOutput=file:/dev/virtio-ports/nestedvmlogs
108-
- path: /mnt/workdir-tmp/nested-ign.json
108+
- path: /var/nested-ign.json
109109
contents:
110110
inline: |
111111
{

mantle/cmd/kola/testiso.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,7 @@ func testAsDisk(ctx context.Context, outdir string) (time.Duration, error) {
10001000
// - note the virtserial port device: we pass through the serial port
10011001
// that was created by kola for test completion
10021002
//
1003-
// 6 - /mnt/workdir-tmp/nested-ign.json contains an ignition config:
1003+
// 6 - /var/nested-ign.json contains an ignition config:
10041004
// - when the system is booted, write a success string to /dev/virtio-ports/testisocompletion
10051005
// - as this serial device is mapped to the host serial device, the test concludes
10061006
func testLiveInstalliscsi(ctx context.Context, inst platform.Install, outdir string) (time.Duration, error) {

0 commit comments

Comments
 (0)