cleanup

check error
edgelesssys · Aug 15, 2024 · 581070c · 581070c
1 parent b61ab94
commit 581070c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/.github/workflows/e2e_regression.yml b/.github/workflows/e2e_regression.yml
@@ -64,7 +64,7 @@ jobs:
         run: |
           just node-installer
           if [[ "${{ matrix.case }}" == "regression" ]]; then
-            # push other dependencies for the regression test
+            # build and push other dependencies for the regression test
             just coordinator initializer port-forwarder openssl service-mesh-proxy
           fi
       - name: Run regression test

diff --git a/e2e/regression/regression_test.go b/e2e/regression/regression_test.go
@@ -33,22 +33,17 @@ func TestRegression(t *testing.T) {
 	require.NoError(t, err)
 
 	platform, err := platforms.FromString(platformStr)
+	require.NoError(t, err)
 
 	runtimeHandler, err := manifest.RuntimeHandler(platform)
 	require.NoError(t, err)
 
-	ct := contrasttest.New(t, imageReplacementsFile, namespaceFile, platform, false)
-	namespace := ct.Namespace
-
 	for _, file := range files {
 		t.Run(file.Name(), func(t *testing.T) {
 			require := require.New(t)
 
-			deploymentName, _ := strings.CutSuffix(file.Name(), ".yaml")
-
-			ct.Namespace = namespace + "-" + deploymentName
-
 			c := kubeclient.NewForTest(t)
+			ct := contrasttest.New(t, imageReplacementsFile, namespaceFile, platform, false)
 			ctx, cancel := context.WithTimeout(context.Background(), 3*time.Minute)
 			defer cancel()
 
@@ -73,6 +68,7 @@ func TestRegression(t *testing.T) {
 			require.True(t.Run("set", ct.Set), "contrast set needs to succeed for subsequent tests")
 			require.True(t.Run("contrast verify", ct.Verify), "contrast verify needs to succeed for subsequent tests")
 
+			deploymentName, _ := strings.CutSuffix(file.Name(), ".yaml")
 			require.NoError(c.WaitFor(ctx, kubeclient.Deployment{}, ct.Namespace, deploymentName))
 		})
 	}

diff --git a/e2e/regression/test-data/nginx.yaml b/e2e/regression/test-data/nginx.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: nginx
-          image: quay.io/nginx/nginx-unprivileged@sha256:a30a0565b20529d70babf04b81cc64d2dc04cfce9ff55d535710fcb35ca4b425
+          image: ghcr.io/edgelesssys/nginx-unprivileged@sha256:1d5be2aa3c296bd589ddd3c9bf2f560919e31ac32bae799a15dd182b6fdb042b
           ports:
             - containerPort: 8080
       runtimeClassName: contrast-cc
diff --git a/e2e/regression/test-data/redis.yaml b/e2e/regression/test-data/redis.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: redis
-          image: docker.io/redis@sha256:a61cb3cf95ea311ed943d2615383c2987dcc5138ee46dd3045e5e597926df51a
+          image: ghcr.io/edgelesssys/redis@sha256:ecb0a964c259a166a1eb62f0eb19621d42bd1cce0bc9bb0c71c828911d4ba93d
           volumeMounts:
             - mountPath: /data
               name: data