Skip to content

Commit ef9af80

Browse files
committed
mantle/kola: add a few comments/tweaks to iscsi test
I had originally started going through iscsi_butane_setup.yaml without the help of the description in testiso.go and I decided to document things myself. Later I found the better description in testiso.go, so let's mention it at the top of the Butane config. Also made a few tweaks.
1 parent 583522a commit ef9af80

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

mantle/cmd/kola/resources/iscsi_butane_setup.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# See the description of testLiveInstalliscsi() in testiso.go for an explanation
2+
# of what this Butane config is doing.
13
variant: fcos
24
version: 1.5.0
35
storage:

mantle/cmd/kola/testiso.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -979,11 +979,11 @@ func testAsDisk(ctx context.Context, outdir string) (time.Duration, error) {
979979
return awaitCompletion(ctx, mach, outdir, completionChannel, nil, []string{liveOKSignal})
980980
}
981981

982-
// iscsi_butane_setup.yaml contain the full butane config but here is an overview of the setup
982+
// iscsi_butane_setup.yaml contains the full butane config but here is an overview of the setup
983983
// 1 - Boot a live ISO with two extra 10G disks with labels "target" and "var"
984-
// - Format and mount `virtio-var` to var
984+
// - Format and mount `virtio-var` to /var
985985
//
986-
// 2 - target.container -> start an iscsi target, using quay.io/jbtrystram/targetcli
986+
// 2 - target.container -> start an iscsi target, using quay.io/coreos-assembler/targetcli
987987
// 3 - setup-targetcli.service calls /usr/local/bin/targetcli_script:
988988
// - instructs targetcli to serve /dev/disk/by-id/virtio-target as an iscsi target
989989
// - disables authentication
@@ -994,14 +994,15 @@ func testAsDisk(ctx context.Context, outdir string) (time.Duration, error) {
994994
// - run coreos-installer on the mounted block device
995995
// - unmount iscsi
996996
//
997-
// 5 - coreos-iscsi-vm.container start a coreos-assemble:
998-
// - launch cosa qemuexec instructing it to boot from an iPXE script
997+
// 5 - coreos-iscsi-vm.container -> start a coreos-assembler conainer:
998+
// - launch kola qemuexec instructing it to boot from an iPXE script
999999
// wich in turns mount the iscsi target and load kernel
1000-
// - note the virtserial port device: we pass through the serial port that was created by kola for test completion
1000+
// - note the virtserial port device: we pass through the serial port
1001+
// that was created by kola for test completion
10011002
//
10021003
// 6 - /mnt/workdir-tmp/nested-ign.json contains an ignition config:
10031004
// - when the system is booted, write a success string to /dev/virtio-ports/testisocompletion
1004-
// - As this serial device is mapped to the host serial device, the test concludes
1005+
// - as this serial device is mapped to the host serial device, the test concludes
10051006
func testLiveInstalliscsi(ctx context.Context, inst platform.Install, outdir string) (time.Duration, error) {
10061007

10071008
builddir := kola.CosaBuild.Dir

0 commit comments

Comments
 (0)