From b30ae0ad3d96a043b86fa3cdf3b586bd88ff6f01 Mon Sep 17 00:00:00 2001
From: Kai Lueke <kailuke@microsoft.com>
Date: Mon, 15 Apr 2024 12:08:27 +0900
Subject: [PATCH] kola: Shorten TPM test name to keep the socket path under the
 limit

The TPM directory is created under the _kola_temp folder for the VM. In
total the path used for the swtpm socket was above the 108 char limit
for some tests.
Shorten the affected test names to keep the socket path under the limit.
---
 kola/tests/misc/tpm.go | 7 ++++---
 platform/local/tpm.go  | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/kola/tests/misc/tpm.go b/kola/tests/misc/tpm.go
index d1e5a51c6..f0be77a3d 100644
--- a/kola/tests/misc/tpm.go
+++ b/kola/tests/misc/tpm.go
@@ -252,18 +252,19 @@ func init() {
 		Run:         runRootTPMCryptenroll,
 		ClusterSize: 0,
 		Platforms:   []string{"qemu"},
-		Name:        "cl.tpm.root-cryptenroll",
+		Name:        "cl.tpm.root-ce",
 		Distros:     []string{"cl"},
 		MinVersion:  semver.Version{Major: 3913, Minor: 0, Patch: 1},
 	})
 	runRootTPMCryptenrollPcrNoUpdate := func(c cluster.TestCluster) {
 		tpmTest(c, IgnitionConfigRootCryptenrollPcrNoUpdate, "/", VariantNoUpdate)
 	}
+	// The test names are part of the UNIX socket path which is limited to 108 chars
 	register.Register(&register.Test{
 		Run:         runRootTPMCryptenrollPcrNoUpdate,
 		ClusterSize: 0,
 		Platforms:   []string{"qemu"},
-		Name:        "cl.tpm.root-cryptenroll-pcr-noupdate",
+		Name:        "cl.tpm.root-ce-pcr-noupd",
 		Distros:     []string{"cl"},
 		MinVersion:  semver.Version{Major: 3913, Minor: 0, Patch: 1},
 	})
@@ -274,7 +275,7 @@ func init() {
 		Run:         runRootTPMCryptenrollPcrWithUpdate,
 		ClusterSize: 0,
 		Platforms:   []string{"qemu"},
-		Name:        "cl.tpm.root-cryptenroll-pcr-withupdate",
+		Name:        "cl.tpm.root-ce-pcr-w-upd",
 		Distros:     []string{"cl"},
 		MinVersion:  semver.Version{Major: 3913, Minor: 0, Patch: 1},
 	})
diff --git a/platform/local/tpm.go b/platform/local/tpm.go
index c4187813b..b57afe5aa 100644
--- a/platform/local/tpm.go
+++ b/platform/local/tpm.go
@@ -20,7 +20,7 @@ func NewSwtpm(dir string) (*SoftwareTPM, error) {
 
 	os.Mkdir(dir, 0700)
 	swtpm.dir = dir
-	swtpm.socketPath = fmt.Sprintf("%v/sock", swtpm.dir)
+	swtpm.socketPath = fmt.Sprintf("%v/sk", swtpm.dir)
 
 	swtpm.process = exec.Command("swtpm", "socket", "--tpmstate", fmt.Sprintf("dir=%v", swtpm.dir), "--ctrl", fmt.Sprintf("type=unixio,path=%v", swtpm.socketPath), "--tpm2")
 	out, err := swtpm.process.StderrPipe()