Fix HPC tests

Signed-off-by: Kirtana Ashok <[email protected]>

test/cri-containerd/jobcontainer_test.go

@@ -525,12 +525,13 @@ func Test_RunContainer_JobContainer_Environment(t *testing.T) {
 	client := newTestRuntimeClient(t)
 
 	type config struct {
-		name           string
-		containerName  string
-		sandboxImage   string
-		containerImage string
-		env            []*runtime.KeyValue
-		exec           []string
+		name               string
+		containerName      string
+		sandboxImage       string
+		containerImage     string
+		env                []*runtime.KeyValue
+		exec               []string
+		expectedExecResult string
 	}
 
 	tests := []config{
@@ -544,7 +545,8 @@ func Test_RunContainer_JobContainer_Environment(t *testing.T) {
 					Key: "PATH", Value: "C:\\Windows\\system32;C:\\Windows",
 				},
 			},
-			exec: []string{"cmd", "/c", "IF", "%PATH%", "==", "C:\\Windows\\system32;C:\\Windows", "( exit 0 )", "ELSE", "(exit -1)"},
+			exec:               []string{"cmd", "/c", "echo %PATH%"},
+			expectedExecResult: "C:\\Windows\\system32;C:\\Windows;C:\\hpc\\;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\WINDOWS\\System32\\Wbem",
 		},
 		{
 			name:           "JobContainer_VolumeMount_WithMountPoint",
@@ -556,7 +558,8 @@ func Test_RunContainer_JobContainer_Environment(t *testing.T) {
 					Key: "PATH", Value: "%CONTAINER_SANDBOX_MOUNT_POINT%\\apps\\vim\\;C:\\Windows\\system32;C:\\Windows",
 				},
 			},
-			exec: []string{"cmd", "/c", "IF", "%PATH%", "==", "%CONTAINER_SANDBOX_MOUNT_POINT%\\apps\\vim\\;C:\\Windows\\system32;C:\\Windows", "( exit -1 )", "ELSE", "(exit 0)"},
+			exec:               []string{"cmd", "/c", "echo %PATH%"},
+			expectedExecResult: `C:\hpc\apps\vim\;C:\Windows\system32;C:\Windows;C:\hpc\;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\Wbem`,
 		},
 	}
 
@@ -589,6 +592,10 @@ func Test_RunContainer_JobContainer_Environment(t *testing.T) {
 			if r.ExitCode != 0 {
 				t.Fatalf("failed with exit code %d checking for job container mount: %s", r.ExitCode, string(r.Stderr))
 			}
+			stdout := strings.TrimSpace(string(r.Stdout))
+			if stdout != test.expectedExecResult {
+				t.Fatalf("PATH does not match. Expected: %v Actual: %v", test.expectedExecResult, stdout)
+			}
 		})
 	}
 }

test/cri-containerd/main_test.go

@@ -57,11 +57,11 @@ const (
 	imageWindowsArgsEscaped = "cplatpublic.azurecr.io/argsescaped:latest"
 	imageWindowsTimezone    = "cplatpublic.azurecr.io/timezone:latest"
 
-	imageJobContainerHNS     = "cplatpublic.azurecr.io/jobcontainer_hns:latest"
-	imageJobContainerETW     = "cplatpublic.azurecr.io/jobcontainer_etw:latest"
-	imageJobContainerVHD     = "cplatpublic.azurecr.io/jobcontainer_vhd:latest"
-	imageJobContainerCmdline = "cplatpublic.azurecr.io/jobcontainer_cmdline:latest"
-	imageJobContainerWorkDir = "cplatpublic.azurecr.io/jobcontainer_workdir:latest"
+	imageJobContainerHNS     = "cplatpublic.azurecr.io/hpc_hns:latest"
+	imageJobContainerETW     = "cplatpublic.azurecr.io/hpc_etw:latest"
+	imageJobContainerVHD     = "cplatpublic.azurecr.io/hpc_vhd:latest"
+	imageJobContainerCmdline = "cplatpublic.azurecr.io/hpc_cmdline:latest"
+	imageJobContainerWorkDir = "cplatpublic.azurecr.io/hpc_workdir:latest"
 
 	gracefulTerminationServercore = "cplatpublic.azurecr.io/servercore-gracefultermination-repro:latest"
 	gracefulTerminationNanoserver = "cplatpublic.azurecr.io/nanoserver-gracefultermination-repro:latest"

test/cri-containerd/test-images/hpc_cmdline/Dockerfile

@@ -0,0 +1,5 @@
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
+
+USER containeradministrator
+
+COPY ./cmdline.exe /

test/cri-containerd/test-images/hpc_etw/Dockerfile

@@ -0,0 +1,6 @@
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
+
+USER containeradministrator
+
+COPY ./etw.exe /
+COPY test.wprp /

test/cri-containerd/test-images/jobcontainer_etw/main.go → test/cri-containerd/test-images/hpc_etw/main.go

@@ -17,7 +17,11 @@ func main() {
 		os.Exit(1)
 	}
 
-	path := filepath.Join(filepath.Dir(os.Args[0]), "Test.wprp")
+	path := filepath.Join(filepath.Dir(os.Args[0]), "test.wprp")
+	if _, err := os.Stat(path); os.IsNotExist(err) {
+		log.Fatalf("failed to find wprp file %v: %s", path, err)
+	}
+
 	if err := exec.Command("wpr", "-start", path).Run(); err != nil {
 		log.Fatalf("failed to wpr start: %s", err)
 	}

test/cri-containerd/test-images/hpc_hns/Dockerfile

@@ -0,0 +1,2 @@
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
+COPY ./hns.exe /

test/cri-containerd/test-images/hpc_vhd/Dockerfile

@@ -0,0 +1,2 @@
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
+COPY ./vhd.exe /

test/cri-containerd/test-images/hpc_workdir/Dockerfile

@@ -0,0 +1,2 @@
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
+COPY ./hpc_workdir.exe /