Merge pull request #140 from alexander-demicev/e2efixes

Split E2E test workflows
rancher · Sep 26, 2023 · 2d489f5 · 2d489f5
2 parents e483c15 + 776546f
commit 2d489f5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 17 deletions.
diff --git a/.github/workflows/e2e-nightly-full.yaml → .github/workflows/e2e-long.yaml b/.github/workflows/e2e-nightly-full.yaml → .github/workflows/e2e-long.yaml
@@ -3,6 +3,9 @@ name: Run nightly e2e tests
 on:
   schedule:
     - cron: "0 0 * * *"
+  push:
+    branches:
+      - main
 
 env:
   NGROK_AUTHTOKEN: ${{ secrets.NGROK_AUTHTOKEN }}
@@ -12,7 +15,6 @@ env:
 
 jobs:
   e2e:
-    concurrency: test-e2e
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
@@ -26,6 +28,7 @@ jobs:
     - name: Run e2e tests
       run: make test-e2e
     - name: Collect run artifacts
+      if: always()
       uses: actions/upload-artifact@v3
       with:
         name: artifacts

diff --git a/.github/workflows/e2e-every-pr.yaml → .github/workflows/e2e-short.yaml b/.github/workflows/e2e-every-pr.yaml → .github/workflows/e2e-short.yaml
@@ -1,17 +1,10 @@
-name: Run e2e tests
+name: Run short e2e tests
 
 on:
-  push:
-    branches:
-      - "main"
   pull_request:
 
-env:
-  RANCHER_PASSWORD: ${{ secrets.RANCHER_PASSWORD }}
-
 jobs:
   e2e:
-    concurrency: test-e2e
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
@@ -25,6 +18,7 @@ jobs:
     - name: Run e2e tests
       run: ISOLATED_MODE=true make test-e2e
     - name: Collect run artifacts
+      if: always()
       uses: actions/upload-artifact@v3
       with:
         name: artifacts

diff --git a/test/e2e/data/rancher/nginx-ingress.yaml b/test/e2e/data/rancher/nginx-ingress.yaml
@@ -500,7 +500,6 @@ spec:
           readOnly: true
       dnsPolicy: ClusterFirst
       nodeSelector:
-        ingress-ready: "true"
         kubernetes.io/os: linux
       serviceAccountName: ingress-nginx
       terminationGracePeriodSeconds: 0

diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
@@ -611,13 +611,6 @@ func configureIsolatedEnvironment(clusterProxy framework.ClusterProxy) {
 			break
 		}
 	}
-
-	if cpNode.GetLabels() == nil {
-		cpNode.Labels = map[string]string{}
-	}
-	cpNode.Labels["ingress-ready"] = "true"
-
-	Expect(clusterProxy.GetClient().Update(ctx, &cpNode)).To(Succeed())
 }
 
 // setupIngress sets up the ingress for the e2e test. If isolatedMode is true, it will install the nginx ingress controller configured for kind, see https://kind.sigs.k8s.io/docs/user/ingress/#ingress-nginx