Revert "Remove legacy e2e tests and promote v2 tests (#4658)" (#4667)

2026-09-30 06:59:09 +02:00 · 2026-09-18 10:03:18 +02:00
parent 78dacc7a53
commit 6df0e09f84
21 changed files with 1303 additions and 112 deletions
@@ -43,12 +43,36 @@ jobs:
          application_id: ${{ secrets.E2E_TESTS_ACCESS_APP_ID }}
          application_private_key: ${{ secrets.E2E_TESTS_ACCESS_PK }}
          organization: ${{ env.TARGET_ORG }}
+
      - name: Run default setup test
        run: hack/e2e-test.sh default-setup
        env:
          GITHUB_TOKEN: "${{steps.config-token.outputs.token}}"
        shell: bash

+  default-setup-v2:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    if: github.event_name != 'pull_request' ||
+      github.event.pull_request.head.repo.id == github.repository_id
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          ref: ${{github.head_ref}}
+
+      - name: Get configure token
+        id: config-token
+        uses: peter-murray/workflow-application-token-action@dad2b81e50ce3edeb5f3b7ffbd79f731368bd668
+        with:
+          application_id: ${{ secrets.E2E_TESTS_ACCESS_APP_ID }}
+          application_private_key: ${{ secrets.E2E_TESTS_ACCESS_PK }}
+          organization: ${{ env.TARGET_ORG }}
+      - name: Run default setup test
+        run: hack/e2e-test.sh default-setup-v2
+        env:
+          GITHUB_TOKEN: "${{steps.config-token.outputs.token}}"
+        shell: bash
+
  single-namespace-setup:
    runs-on: ubuntu-latest
    timeout-minutes: 20
@@ -72,6 +96,29 @@ jobs:
          GITHUB_TOKEN: "${{steps.config-token.outputs.token}}"
        shell: bash

+  single-namespace-setup-v2:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    if: github.event_name != 'pull_request' ||
+      github.event.pull_request.head.repo.id == github.repository_id
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          ref: ${{github.head_ref}}
+
+      - name: Get configure token
+        id: config-token
+        uses: peter-murray/workflow-application-token-action@dad2b81e50ce3edeb5f3b7ffbd79f731368bd668
+        with:
+          application_id: ${{ secrets.E2E_TESTS_ACCESS_APP_ID }}
+          application_private_key: ${{ secrets.E2E_TESTS_ACCESS_PK }}
+          organization: ${{ env.TARGET_ORG }}
+      - name: Run single namespace setup test
+        run: hack/e2e-test.sh single-namespace-setup-v2
+        env:
+          GITHUB_TOKEN: "${{steps.config-token.outputs.token}}"
+        shell: bash
+
  dind-mode-setup:
    runs-on: ubuntu-latest
    timeout-minutes: 20
@@ -95,6 +142,29 @@ jobs:
          GITHUB_TOKEN: "${{steps.config-token.outputs.token}}"
        shell: bash

+  dind-mode-setup-v2:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    if: github.event_name != 'pull_request' ||
+      github.event.pull_request.head.repo.id == github.repository_id
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          ref: ${{github.head_ref}}
+
+      - name: Get configure token
+        id: config-token
+        uses: peter-murray/workflow-application-token-action@dad2b81e50ce3edeb5f3b7ffbd79f731368bd668
+        with:
+          application_id: ${{ secrets.E2E_TESTS_ACCESS_APP_ID }}
+          application_private_key: ${{ secrets.E2E_TESTS_ACCESS_PK }}
+          organization: ${{ env.TARGET_ORG }}
+      - name: Run dind mode setup test
+        run: hack/e2e-test.sh dind-mode-setup-v2
+        env:
+          GITHUB_TOKEN: "${{steps.config-token.outputs.token}}"
+        shell: bash
+
  kubernetes-mode-setup:
    runs-on: ubuntu-latest
    timeout-minutes: 20
@@ -118,6 +188,29 @@ jobs:
          GITHUB_TOKEN: "${{steps.config-token.outputs.token}}"
        shell: bash

+  kubernetes-mode-setup-v2:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    if: github.event_name != 'pull_request' ||
+      github.event.pull_request.head.repo.id == github.repository_id
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          ref: ${{github.head_ref}}
+
+      - name: Get configure token
+        id: config-token
+        uses: peter-murray/workflow-application-token-action@dad2b81e50ce3edeb5f3b7ffbd79f731368bd668
+        with:
+          application_id: ${{ secrets.E2E_TESTS_ACCESS_APP_ID }}
+          application_private_key: ${{ secrets.E2E_TESTS_ACCESS_PK }}
+          organization: ${{ env.TARGET_ORG }}
+      - name: Run kubernetes mode setup test
+        run: hack/e2e-test.sh kubernetes-mode-setup-v2
+        env:
+          GITHUB_TOKEN: "${{steps.config-token.outputs.token}}"
+        shell: bash
+
  auth-proxy-setup:
    runs-on: ubuntu-latest
    timeout-minutes: 20
@@ -135,8 +228,31 @@ jobs:
          application_id: ${{ secrets.E2E_TESTS_ACCESS_APP_ID }}
          application_private_key: ${{ secrets.E2E_TESTS_ACCESS_PK }}
          organization: ${{ env.TARGET_ORG }}
-      - name: Run auth proxy setup test
-        run: hack/e2e-test.sh auth-proxy-setup
+      - name: Run single namespace setup test
+        run: hack/e2e-test.sh single-namespace-setup
+        env:
+          GITHUB_TOKEN: "${{steps.config-token.outputs.token}}"
+        shell: bash
+
+  auth-proxy-setup-v2:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    if: github.event_name != 'pull_request' ||
+      github.event.pull_request.head.repo.id == github.repository_id
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          ref: ${{github.head_ref}}
+
+      - name: Get configure token
+        id: config-token
+        uses: peter-murray/workflow-application-token-action@dad2b81e50ce3edeb5f3b7ffbd79f731368bd668
+        with:
+          application_id: ${{ secrets.E2E_TESTS_ACCESS_APP_ID }}
+          application_private_key: ${{ secrets.E2E_TESTS_ACCESS_PK }}
+          organization: ${{ env.TARGET_ORG }}
+      - name: Run single namespace setup test
+        run: hack/e2e-test.sh single-namespace-setup-v2
        env:
          GITHUB_TOKEN: "${{steps.config-token.outputs.token}}"
        shell: bash
@@ -164,6 +280,29 @@ jobs:
          GITHUB_TOKEN: "${{steps.config-token.outputs.token}}"
        shell: bash

+  anonymous-proxy-setup-v2:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    if: github.event_name != 'pull_request' ||
+      github.event.pull_request.head.repo.id == github.repository_id
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          ref: ${{github.head_ref}}
+
+      - name: Get configure token
+        id: config-token
+        uses: peter-murray/workflow-application-token-action@dad2b81e50ce3edeb5f3b7ffbd79f731368bd668
+        with:
+          application_id: ${{ secrets.E2E_TESTS_ACCESS_APP_ID }}
+          application_private_key: ${{ secrets.E2E_TESTS_ACCESS_PK }}
+          organization: ${{ env.TARGET_ORG }}
+      - name: Run anonymous proxy setup test
+        run: hack/e2e-test.sh anonymous-proxy-setup-v2
+        env:
+          GITHUB_TOKEN: "${{steps.config-token.outputs.token}}"
+        shell: bash
+
  self-signed-ca-setup:
    runs-on: ubuntu-latest
    timeout-minutes: 20
@@ -187,6 +326,29 @@ jobs:
          GITHUB_TOKEN: "${{steps.config-token.outputs.token}}"
        shell: bash

+  self-signed-ca-setup-v2:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    if: github.event_name != 'pull_request' ||
+      github.event.pull_request.head.repo.id == github.repository_id
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          ref: ${{github.head_ref}}
+
+      - name: Get configure token
+        id: config-token
+        uses: peter-murray/workflow-application-token-action@dad2b81e50ce3edeb5f3b7ffbd79f731368bd668
+        with:
+          application_id: ${{ secrets.E2E_TESTS_ACCESS_APP_ID }}
+          application_private_key: ${{ secrets.E2E_TESTS_ACCESS_PK }}
+          organization: ${{ env.TARGET_ORG }}
+      - name: Run self signed CA setup test
+        run: hack/e2e-test.sh self-signed-ca-setup-v2
+        env:
+          GITHUB_TOKEN: "${{steps.config-token.outputs.token}}"
+        shell: bash
+
  update-gha-runner-scale-set-tests:
    runs-on: ubuntu-latest
    timeout-minutes: 20
@@ -210,6 +372,29 @@ jobs:
          GITHUB_TOKEN: "${{steps.config-token.outputs.token}}"
        shell: bash

+  update-gha-runner-scale-set-tests-v2:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    if: github.event_name != 'pull_request' ||
+      github.event.pull_request.head.repo.id == github.repository_id
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          ref: ${{github.head_ref}}
+
+      - name: Get configure token
+        id: config-token
+        uses: peter-murray/workflow-application-token-action@dad2b81e50ce3edeb5f3b7ffbd79f731368bd668
+        with:
+          application_id: ${{ secrets.E2E_TESTS_ACCESS_APP_ID }}
+          application_private_key: ${{ secrets.E2E_TESTS_ACCESS_PK }}
+          organization: ${{ env.TARGET_ORG }}
+      - name: Run update strategy test
+        run: hack/e2e-test.sh update-gha-runner-scale-set-v2
+        env:
+          GITHUB_TOKEN: "${{steps.config-token.outputs.token}}"
+        shell: bash
+
  init-with-min-runners:
    runs-on: ubuntu-latest
    timeout-minutes: 20
@@ -232,3 +417,26 @@ jobs:
        env:
          GITHUB_TOKEN: "${{steps.config-token.outputs.token}}"
        shell: bash
+
+  init-with-min-runners-v2:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    if: github.event_name != 'pull_request' ||
+      github.event.pull_request.head.repo.id == github.repository_id
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          ref: ${{github.head_ref}}
+
+      - name: Get configure token
+        id: config-token
+        uses: peter-murray/workflow-application-token-action@dad2b81e50ce3edeb5f3b7ffbd79f731368bd668
+        with:
+          application_id: ${{ secrets.E2E_TESTS_ACCESS_APP_ID }}
+          application_private_key: ${{ secrets.E2E_TESTS_ACCESS_PK }}
+          organization: ${{ env.TARGET_ORG }}
+      - name: Run init with min runners test
+        run: hack/e2e-test.sh init-with-min-runners-v2
+        env:
+          GITHUB_TOKEN: "${{steps.config-token.outputs.token}}"
+        shell: bash