8989 "iso-offline-install.bios" ,
9090 "iso-offline-install.mpath.bios" ,
9191 "iso-offline-install-fromram.4k.uefi" ,
92- "iso-offline-install-iscsi.bios" ,
92+ "iso-offline-install-iscsi.ibft.bios" ,
93+ "iso-offline-install-iscsi.manual.bios" ,
9394 "miniso-install.bios" ,
9495 "miniso-install.nm.bios" ,
9596 "miniso-install.4k.uefi" ,
@@ -112,7 +113,8 @@ var (
112113 "miniso-install.nm.s390fw" ,
113114 "miniso-install.4k.nm.s390fw" ,
114115 // FIXME https://github.com/coreos/fedora-coreos-tracker/issues/1657
115- //"iso-offline-install-iscsi.bios",
116+ //"iso-offline-install-iscsi.ibft.bios",
117+ //"iso-offline-install-iscsi.manual.bios",
116118 }
117119 tests_ppc64le = []string {
118120 "iso-live-login.ppcfw" ,
@@ -126,7 +128,8 @@ var (
126128 "pxe-online-install.ppcfw" ,
127129 "pxe-offline-install.4k.ppcfw" ,
128130 // FIXME https://github.com/coreos/fedora-coreos-tracker/issues/1657
129- //"iso-offline-install-iscsi.bios",
131+ //"iso-offline-install-iscsi.ibft.bios",
132+ //"iso-offline-install-iscsi.manual.bios",
130133 }
131134 tests_aarch64 = []string {
132135 "iso-live-login.uefi" ,
@@ -143,7 +146,8 @@ var (
143146 "pxe-online-install.uefi" ,
144147 "pxe-online-install.4k.uefi" ,
145148 // FIXME https://github.com/coreos/fedora-coreos-tracker/issues/1657
146- //"iso-offline-install-iscsi.bios",
149+ //"iso-offline-install-iscsi.ibft.bios",
150+ //"iso-offline-install-iscsi.manual.bios",
147151 }
148152)
149153
@@ -609,7 +613,16 @@ func runTestIso(cmd *cobra.Command, args []string) (err error) {
609613 case "miniso-install" :
610614 duration , err = testLiveIso (ctx , inst , filepath .Join (outputDir , test ), true )
611615 case "iso-offline-install-iscsi" :
612- duration , err = testLiveInstalliscsi (ctx , inst , filepath .Join (outputDir , test ))
616+ var butane_config string
617+ switch components [1 ] {
618+ case "ibft" :
619+ butane_config = strings .ReplaceAll (iscsi_butane_config , "COREOS_INSTALLER_KARGS" , "--append-karg rd.iscsi.firmware=1 --append-karg ip=ibft" )
620+ case "manual" :
621+ butane_config = strings .ReplaceAll (iscsi_butane_config , "COREOS_INSTALLER_KARGS" , "--append-karg rd.iscsi.initiator=iqn.2023-11.coreos.diskless:testsetup --append-karg netroot=iscsi:10.0.2.15::::iqn.2023-10.coreos.target.vm:coreos" )
622+ default :
623+ plog .Fatalf ("Unknown test name:%s" , test )
624+ }
625+ duration , err = testLiveInstalliscsi (ctx , inst , filepath .Join (outputDir , test ), butane_config )
613626 default :
614627 plog .Fatalf ("Unknown test name:%s" , test )
615628 }
@@ -1003,7 +1016,7 @@ func testAsDisk(ctx context.Context, outdir string) (time.Duration, error) {
10031016// 6 - /var/nested-ign.json contains an ignition config:
10041017// - when the system is booted, write a success string to /dev/virtio-ports/testisocompletion
10051018// - as this serial device is mapped to the host serial device, the test concludes
1006- func testLiveInstalliscsi (ctx context.Context , inst platform.Install , outdir string ) (time.Duration , error ) {
1019+ func testLiveInstalliscsi (ctx context.Context , inst platform.Install , outdir string , butane string ) (time.Duration , error ) {
10071020
10081021 builddir := kola .CosaBuild .Dir
10091022 isopath := filepath .Join (builddir , kola .CosaBuild .Meta .BuildArtifacts .LiveIso .Path )
@@ -1050,7 +1063,7 @@ func testLiveInstalliscsi(ctx context.Context, inst platform.Install, outdir str
10501063 // We need more memory to start another VM within !
10511064 builder .MemoryMiB = 2048
10521065
1053- var iscsiTargetConfig = conf .Butane (iscsi_butane_config )
1066+ var iscsiTargetConfig = conf .Butane (butane )
10541067
10551068 config , err := iscsiTargetConfig .Render (conf .FailWarnings )
10561069 if err != nil {
0 commit comments