use container images from coreos-assembler org

Point test that requires containers to use images from the coreos-assembler org. Following coreos#3727 See coreos/fedora-coreos-tracker#1639
jbtrystram · Feb 15, 2024 · 0c5620f · 0c5620f
1 parent 5a81fdf
commit 0c5620f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/mantle/cmd/kola/resources/iscsi_butane_setup.yaml b/mantle/cmd/kola/resources/iscsi_butane_setup.yaml
@@ -19,7 +19,7 @@ storage:
             Wants=network-online.target
             OnFailure=emergency.target
             [Container]
-            Image=quay.io/jbtrystram/targetcli:latest
+            Image=quay.io/coreos-assembler/target:latest
             ContainerName=target
             Network=host
             Volume=/dev/disk/by-id/virtio-target:/dev/disk/by-id/virtio-target
@@ -60,7 +60,7 @@ storage:
           iscsiadm -m discovery -t st -p 127.0.0.1
           iscsiadm -m node -T iqn.2023-10.coreos.target.vm:coreos -l
           # Give a bit of time to udev to create the persistent names paths
-          sleep 2 
+          sleep 2
           # Install coreos
           coreos-installer install \
             /dev/disk/by-path/ip-127.0.0.1\:3260-iscsi-iqn.2023-10.coreos.target.vm\:coreos-lun-0 \
@@ -74,8 +74,8 @@ storage:
         inline: |
           [Unit]
           Description=Boot VM over iSCSI
-          After=network-online.target After=nss-lookup.target install-coreos-to-iscsi-target.service 
-          Wants=network-online.target install-coreos-to-iscsi-target.service 
+          After=network-online.target After=nss-lookup.target install-coreos-to-iscsi-target.service
+          Wants=network-online.target install-coreos-to-iscsi-target.service
           Requires=install-coreos-to-iscsi-target.service
           OnFailure=emergency.target
           [Container]
@@ -94,7 +94,7 @@ storage:
           ExecStartPre=chmod 777 /dev/virtio-ports/testiscsicompletion
     - path: /mnt/workdir-tmp/nested-ign.json
       contents:
-        inline: | 
+        inline: |
           {
             "ignition": {
               "version": "3.1.0"

diff --git a/mantle/kola/tests/ignition/luks.go b/mantle/kola/tests/ignition/luks.go
@@ -91,12 +91,7 @@ func setupTangMachine(c cluster.TestCluster) ut.TangServer {
 		c.Fatal(err)
 	}
 
-	// TODO: move container image to centralized namespace
-	// container source: https://github.com/mike-nguyen/tang-docker-container/
-	containerImage := "quay.io/mike_nguyen/tang"
-	if coreosarch.CurrentRpmArch() != "x86_64" {
-		containerImage = "quay.io/multi-arch/tang:" + coreosarch.CurrentRpmArch()
-	}
+	containerImage := "quay.io/coreos-assembler/tang:latest"
 
 	containerID, errMsg, err := m.SSH("sudo podman run -d -p 80:80 " + containerImage)
 	if err != nil {