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

testiso - iscsi : misc fixes to improve reliability and disable the test for other arches than x86 #3705

Merged
merged 2 commits into from
Jan 31, 2024
Merged

testiso - iscsi : misc fixes to improve reliability and disable the test for other arches than x86 #3705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cba8ff6
[kola testiso] iscsi - misc fixes to improve reliability
jbtrystram Jan 22, 2024
bd3a6aa
Disable the iscsi test on other arches than x86
jbtrystram Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 17 additions & 9 deletions mantle/cmd/kola/resources/iscsi_butane_setup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ storage:
label: var
with_mount_unit: true
files:
- path: /etc/containers/systemd/target.container
- path: /etc/containers/systemd/targetd.container
contents:
inline: |
[Unit]
Expand All @@ -20,12 +20,16 @@ storage:
OnFailure=emergency.target
[Container]
Image=quay.io/jbtrystram/targetcli:latest
ContainerName=target
ContainerName=targetd
Network=host
Volume=/dev/disk/by-id/virtio-target:/dev/disk/by-id/virtio-target
Volume=/lib/modules:/lib/modules
Volume=/sys/kernel/config:/sys/kernel/config
PodmanArgs=--privileged
# FIXME this requires podman 4.9.0
#HealthCmd=/usr/bin/targetcli pwd
#HealthStartPeriod=15s
#Notify=healthy
[Install]
# Start by default on boot
WantedBy=multi-user.target
Expand All @@ -35,7 +39,10 @@ storage:
inline: |
#!/bin/bash
set -xeuo pipefail
podman exec target bash -exc "
podman exec targetd bash -exc "
# wait until the targetcli socket is ready
# FIXME: use RestartMode=direct instead in the systemd unit but we need systemd v254
while ! test -S /var/run/targetclid.sock; do sleep 1; done
targetcli /backstores/block create name=coreos dev=/dev/disk/by-id/virtio-target
targetcli iscsi/ create iqn.2023-10.coreos.target.vm:coreos
targetcli iscsi/iqn.2023-10.coreos.target.vm:coreos/tpg1/luns create /backstores/block/coreos
Expand Down Expand Up @@ -82,16 +89,16 @@ storage:
Image=quay.io/coreos-assembler/coreos-assembler
ContainerName=iscsiboot
Volume=/mnt/workdir-tmp/:/mnt/workdir-tmp/
Volume=/dev/virtio-ports/testiscsicompletion:/mnt/serial
Volume=/dev/virtio-ports/testisocompletion:/mnt/serial
PodmanArgs=--privileged
Network=host
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=testiscsicompletion
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
[Install]
# Start by default on boot
WantedBy=multi-user.target
[Service]
# fix permissions on the serial device before passing it as a volume
ExecStartPre=chmod 777 /dev/virtio-ports/testiscsicompletion
ExecStartPre=chmod 777 /dev/virtio-ports/testisocompletion
- path: /mnt/workdir-tmp/nested-ign.json
contents:
inline: |
Expand All @@ -102,7 +109,7 @@ storage:
"systemd": {
"units": [
{
"contents": "[Unit]\nDescription=iSCSI Boot Signal Completion\nAfter=multi-user.target\nOnFailureJobMode=isolate\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/bin/sh -c '/usr/bin/echo \"iscsi-boot-ok\" \u003e/dev/virtio-ports/testiscsicompletion \u0026\u0026 systemctl poweroff'\n[Install]\nRequiredBy=multi-user.target\n",
"contents": "[Unit]\nDescription=iSCSI Boot Signal Completion\nAfter=multi-user.target\nOnFailureJobMode=isolate\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/bin/sh -c '/usr/bin/echo \"iscsi-boot-ok\" \u003e/dev/virtio-ports/testisocompletion \u0026\u0026 systemctl poweroff'\n[Install]\nRequiredBy=multi-user.target\n",
"enabled": true,
"name": "successful-boot-signal.service"
}
Expand All @@ -116,14 +123,15 @@ systemd:
contents: |
[Unit]
Description=Setup targetcli
Requires=target.service
After=target.service
Requires=targetd.service
After=targetd.service
ConditionFirstBoot=true
OnFailure=emergency.target
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/usr/local/bin/targetcli_script
Restart=on-failure
jbtrystram marked this conversation as resolved.
Show resolved Hide resolved
[Install]
WantedBy=multi-user.target
- name: install-coreos-to-iscsi-target.service
Expand Down
13 changes: 8 additions & 5 deletions mantle/cmd/kola/testiso.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ var (
"miniso-install.s390fw",
"miniso-install.nm.s390fw",
"miniso-install.4k.nm.s390fw",
"iso-offline-install-iscsi.bios",
// FIXME https://github.com/coreos/fedora-coreos-tracker/issues/1657
//"iso-offline-install-iscsi.bios",
}
tests_ppc64le = []string{
"iso-live-login.ppcfw",
Expand All @@ -124,7 +125,8 @@ var (
"miniso-install.4k.nm.ppcfw",
"pxe-online-install.ppcfw",
"pxe-offline-install.4k.ppcfw",
"iso-offline-install-iscsi.bios",
// FIXME https://github.com/coreos/fedora-coreos-tracker/issues/1657
//"iso-offline-install-iscsi.bios",
}
tests_aarch64 = []string{
"iso-live-login.uefi",
Expand All @@ -140,7 +142,8 @@ var (
"pxe-offline-install.4k.uefi",
"pxe-online-install.uefi",
"pxe-online-install.4k.uefi",
"iso-offline-install-iscsi.bios",
// FIXME https://github.com/coreos/fedora-coreos-tracker/issues/1657
//"iso-offline-install-iscsi.bios",
}
)

Expand Down Expand Up @@ -997,7 +1000,7 @@ func testAsDisk(ctx context.Context, outdir string) (time.Duration, error) {
// - note the virtserial port device: we pass through the serial port that was created by kola for test completion
//
// 6 - /mnt/workdir-tmp/nested-ign.json contains an ignition config:
// - when the system is booted, write a success string to /dev/virtio-ports/testiscsicompletion
// - when the system is booted, write a success string to /dev/virtio-ports/testisocompletion
// - As this serial device is mapped to the host serial device, the test concludes
func testLiveInstalliscsi(ctx context.Context, inst platform.Install, outdir string) (time.Duration, error) {

Expand All @@ -1012,7 +1015,7 @@ func testLiveInstalliscsi(ctx context.Context, inst platform.Install, outdir str
return 0, err
}

completionChannel, err := builder.VirtioChannelRead("testiscsicompletion")
completionChannel, err := builder.VirtioChannelRead("testisocompletion")
if err != nil {
return 0, err
}
Expand Down