From e8d9164b934a8575362a9a8f35d1ba09ed55587c Mon Sep 17 00:00:00 2001
From: Thilo Fromm <thilofromm@microsoft.com>
Date: Mon, 16 Oct 2023 11:26:42 +0200
Subject: [PATCH] kola torcx replacement: fix sysext.custom-docker, address PR
 feedback

Signed-off-by: Thilo Fromm <thilofromm@microsoft.com>
---
 kola/tests/docker/torcx_manifest_pkgs.go |  7 ++-----
 kola/tests/sysext/disable_containerd.go  |  5 +++++
 kola/tests/sysext/sysext.go              | 23 ++++++++++++++++++++++-
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/kola/tests/docker/torcx_manifest_pkgs.go b/kola/tests/docker/torcx_manifest_pkgs.go
index ca83a0621..d5665332d 100644
--- a/kola/tests/docker/torcx_manifest_pkgs.go
+++ b/kola/tests/docker/torcx_manifest_pkgs.go
@@ -37,12 +37,9 @@ func init() {
 		ExcludePlatforms: []string{"do"},
 		Distros:          []string{"cl"},
 		// This test is normally not related to the cloud environment
-		Platforms: []string{"qemu", "qemu-unpriv"},
+		Platforms:  []string{"qemu", "qemu-unpriv"},
+		EndVersion: semver.Version{Major: 3745},
 		SkipFunc: func(version semver.Version, channel, arch, platform string) bool {
-			// Releases after 3745 don't ship torcx at all (these use sysext)
-			if (0 < version.Compare(semver.Version{Major: 3745})) {
-				return true
-			}
 			// LTS (3033) does not have the network-kargs service pulled in:
 			// https://github.com/flatcar/coreos-overlay/pull/1848/commits/9e04bc12c3c7eb38da05173dc0ff7beaefa13446
 			// Let's skip this test for < 3034 on ESX.
diff --git a/kola/tests/sysext/disable_containerd.go b/kola/tests/sysext/disable_containerd.go
index 544d430c3..4d92381d2 100644
--- a/kola/tests/sysext/disable_containerd.go
+++ b/kola/tests/sysext/disable_containerd.go
@@ -29,6 +29,7 @@ func init() {
 		Name:        "sysext.disable-containerd",
 		// Only releases after 3745 ship sysext
 		MinVersion: semver.Version{Major: 3746},
+		// We also disable our vendor docker sysext since it depends on the containerd sysext.
 		UserData: conf.Butane(`
 variant: flatcar
 version: 1.0.0
@@ -38,6 +39,10 @@ storage:
     target: /dev/null
     hard: false
     overwrite: true
+  - path: /etc/extensions/docker-flatcar.raw
+    target: /dev/null
+    hard: false
+    overwrite: true
 `),
 		Distros: []string{"cl"},
 	})
diff --git a/kola/tests/sysext/sysext.go b/kola/tests/sysext/sysext.go
index 01688bba7..e328d9a64 100644
--- a/kola/tests/sysext/sysext.go
+++ b/kola/tests/sysext/sysext.go
@@ -227,6 +227,7 @@ func init() {
 		// This test is normally not related to the cloud environment
 		Platforms:  []string{"qemu", "qemu-unpriv"},
 		MinVersion: semver.Version{Major: 3603},
+		EndVersion: semver.Version{Major: 3745},
 		UserData: conf.ContainerLinuxConfig(`storage:
   files:
     - path: /etc/extensions/test/usr/lib/extension-release.d/extension-release.test
@@ -240,19 +241,39 @@ func init() {
           sysext works`),
 	})
 	register.Register(&register.Test{
-		Name:        "sysext.custom-docker",
+		Name:        "sysext.custom-docker.torcx",
 		Run:         checkSysextCustomDocker,
 		ClusterSize: 1,
 		Distros:     []string{"cl"},
 		// This test is normally not related to the cloud environment
 		Platforms:  []string{"qemu", "qemu-unpriv"},
 		MinVersion: semver.Version{Major: 3185},
+		EndVersion: semver.Version{Major: 3745},
 		UserData: conf.ContainerLinuxConfig(`storage:
   files:
     - path: /etc/systemd/system-generators/torcx-generator
   directories:
     - path: /etc/extensions/docker-flatcar
     - path: /etc/extensions/containerd-flatcar`),
+	})
+	register.Register(&register.Test{
+		Name:        "sysext.custom-docker.sysext",
+		Run:         checkSysextCustomDocker,
+		ClusterSize: 1,
+		Distros:     []string{"cl"},
+		// This test is normally not related to the cloud environment
+		Platforms:  []string{"qemu", "qemu-unpriv"},
+		MinVersion: semver.Version{Major: 3746},
+		UserData: conf.Butane(`
+variant: flatcar
+version: 1.0.0
+storage:
+  links:
+  - path: /etc/extensions/docker-flatcar.raw
+    target: /dev/null
+    hard: false
+    overwrite: true
+`),
 	})
 	register.Register(&register.Test{
 		Name:        "sysext.custom-oem",