From fced19c3fc5326a2628cfb417cc9e7aa4754364f Mon Sep 17 00:00:00 2001
From: slonka <slonka@users.noreply.github.com>
Date: Thu, 26 Sep 2024 14:37:34 +0200
Subject: [PATCH] chore(debug): restore commits

Signed-off-by: slonka <slonka@users.noreply.github.com>
---
 .github/workflows/_e2e.yaml                  | 12 +++++-------
 .github/workflows/_test.yaml                 |  6 +++---
 .github/workflows/build-test-distribute.yaml |  4 +---
 test/framework/k8s_cluster.go                |  6 +++++-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/_e2e.yaml b/.github/workflows/_e2e.yaml
index a478f31c435e..e08f5fd4e60a 100644
--- a/.github/workflows/_e2e.yaml
+++ b/.github/workflows/_e2e.yaml
@@ -19,7 +19,7 @@ env:
   E2E_PARAM_PARALLELISM: ${{ fromJSON(inputs.matrix).parallelism }}
 jobs:
   e2e:
-    timeout-minutes: 60
+    timeout-minutes: 360
     # can't use env vars here
     runs-on: ${{ inputs.runner }}
     if: ${{ inputs.runner != '' }}
@@ -121,12 +121,10 @@ jobs:
             trap "on_exit" EXIT
           fi
           
-          if [[ "${{ env.E2E_PARAM_TARGET }}" != "" ]]; then
-            target="test/e2e-${{ env.E2E_PARAM_TARGET }}"
-          else
-            target="test/e2e"
-          fi
-          make ${MAKE_PARAMETERS} CI=true "${target}"
+          make ${MAKE_PARAMETERS} test/e2e/debug CI=true E2E_PKG_LIST=./test/e2e_env/kubernetes/...
+      - name: Setup tmate session
+        if: failure()
+        uses: mxschmitt/action-tmate@v3
       - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         if: always()
         with:
diff --git a/.github/workflows/_test.yaml b/.github/workflows/_test.yaml
index cbe708ecd0b5..f3c3c40c37c1 100644
--- a/.github/workflows/_test.yaml
+++ b/.github/workflows/_test.yaml
@@ -17,7 +17,7 @@ env:
 jobs:
   test_unit:
     timeout-minutes: 20
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci/skip-test') }}
+    if: false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -57,8 +57,8 @@ jobs:
                 "sidecarContainers": [""]
               },
               "test_e2e_env": {
-                "target": ["kubernetes", "universal", "multizone"],
-                "k8sVersion": ["kind", "kindIpv6", "${{ env.K8S_MAX_VERSION }}"],
+                "target": ["kubernetes"],
+                "k8sVersion": ["${{ env.K8S_MAX_VERSION }}"],
                 "arch": ["amd64"],
                 "parallelism": [1],
                 "cniNetworkPlugin": ["flannel"],
diff --git a/.github/workflows/build-test-distribute.yaml b/.github/workflows/build-test-distribute.yaml
index 408fd861458b..3d572c293c9c 100644
--- a/.github/workflows/build-test-distribute.yaml
+++ b/.github/workflows/build-test-distribute.yaml
@@ -63,8 +63,6 @@ jobs:
           make dev/tools
       - run: |
           make clean
-      - run: |
-          make check
       - id: sca-project
         uses: Kong/public-shared-actions/security-actions/sca@ecbcd7051e12e6e3dc37dc890820bbce457bc05f # v2.6.0
         with:
@@ -84,7 +82,7 @@ jobs:
     uses: ./.github/workflows/_test.yaml
     with:
       FULL_MATRIX: ${{ needs.check.outputs.FULL_MATRIX }}
-      RUNNERS_BY_ARCH: ${{ (github.event_name == 'push' || github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) && '{"amd64":"ubuntu-latest-kong","arm64":"ubuntu-latest-arm64-kong"}' || '{"amd64":"ubuntu-latest","arm64":""}' }}
+      RUNNERS_BY_ARCH: ${{ (github.event_name == 'push' || github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) && '{"amd64":"ubuntu-latest-kong","arm64":"ubuntu-latest-arm64-kong"}' || '{"amd64":"ubuntu-latest-kong","arm64":""}' }}
     secrets: inherit
   build_publish:
     permissions:
diff --git a/test/framework/k8s_cluster.go b/test/framework/k8s_cluster.go
index d3b9b0716fc5..5b4bf6af24dd 100644
--- a/test/framework/k8s_cluster.go
+++ b/test/framework/k8s_cluster.go
@@ -836,7 +836,11 @@ func (c *K8sCluster) GetKuma() ControlPlane {
 func (c *K8sCluster) GetKumaCPLogs() (string, error) {
 	logs := ""
 
-	pods := c.GetKuma().(*K8sControlPlane).GetKumaCPPods()
+	kuma := c.GetKuma().(*K8sControlPlane)
+	if kuma == nil {
+		return "", errors.Errorf("no kuma-cp registered")
+	}
+	pods := kuma.GetKumaCPPods()
 	if len(pods) < 1 {
 		return "", errors.Errorf("no kuma-cp pods found for logs")
 	}