kola: remove cmdline parameters for Tang and TPM tests

flatcar · Mar 25, 2024 · 930be7c · 930be7c
1 parent dd7518a
commit 930be7c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/kola/tests/misc/tang.go b/kola/tests/misc/tang.go
@@ -29,14 +29,13 @@ const (
 			"version": "3.3.0"
 		},
 		"kernelArguments": {
-			"shouldExist": ["rd.luks.name=12345678-9abc-def0-1234-56789abcdef0=rootencrypted", "rd.networkd=1", "systemd.mask=systemd-cryptsetup@rootencrypted.service"]
+			"shouldExist": ["rd.networkd=1"]
 		},
 		"storage": {
 			"luks": [
 				{
 					"name": "rootencrypted",
 					"device": "/dev/disk/by-partlabel/ROOT",
-					"uuid": "12345678-9abc-def0-1234-56789abcdef0",
 					"wipeVolume": true,
 					"clevis": {
 						"tang": [
@@ -120,7 +119,7 @@ func init() {
 		Platforms:   []string{"qemu"},
 		Name:        "cl.tang.root",
 		Distros:     []string{"cl"},
-		MinVersion:  semver.Version{Major: 3880},
+		MinVersion:  semver.Version{Major: 3913, Minor: 0, Patch: 1},
 	})
 
 	runNonRootTang := func(c cluster.TestCluster) {
@@ -132,7 +131,7 @@ func init() {
 		Platforms:   []string{"qemu"},
 		Name:        "cl.tang.nonroot",
 		Distros:     []string{"cl"},
-		MinVersion:  semver.Version{Major: 3880},
+		MinVersion:  semver.Version{Major: 3913, Minor: 0, Patch: 1},
 	})
 }
 

diff --git a/kola/tests/misc/tpm.go b/kola/tests/misc/tpm.go
@@ -24,15 +24,11 @@ const (
 			"timeouts": {},
 			"version": "3.3.0"
 		},
-		"kernelArguments": {
-			"shouldExist": ["rd.luks.name=12345678-9abc-def0-1234-56789abcdef0=rootencrypted", "systemd.mask=systemd-cryptsetup@rootencrypted.service"]
-		},
 		"storage": {
 			"luks": [
 				{
 					"name": "rootencrypted",
 					"device": "/dev/disk/by-partlabel/ROOT",
-					"uuid": "12345678-9abc-def0-1234-56789abcdef0",
 					"wipeVolume": true,
 					"clevis": {
 						"tpm2": true
@@ -106,7 +102,7 @@ func init() {
 		Platforms:   []string{"qemu"},
 		Name:        "cl.tpm.root",
 		Distros:     []string{"cl"},
-		MinVersion:  semver.Version{Major: 3880},
+		MinVersion:  semver.Version{Major: 3913, Minor: 0, Patch: 1},
 	})
 
 	runNonRootTPM := func(c cluster.TestCluster) {
@@ -118,7 +114,7 @@ func init() {
 		Platforms:   []string{"qemu"},
 		Name:        "cl.tpm.nonroot",
 		Distros:     []string{"cl"},
-		MinVersion:  semver.Version{Major: 3880},
+		MinVersion:  semver.Version{Major: 3913, Minor: 0, Patch: 1},
 	})
 }