kola torcx replacement: fix sysext.custom-docker, address PR feedback

Signed-off-by: Thilo Fromm <thilofromm@microsoft.com>
flatcar · Oct 16, 2023 · 7deb834 · 7deb834
1 parent c48fb8b
commit 7deb834
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git 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
@@ -38,6 +38,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
@@ -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",