From fbdb10116f2cf7fd7eb4f68d6aa69fddc31fcf68 Mon Sep 17 00:00:00 2001 From: Leonard Cohnen Date: Mon, 9 Dec 2024 17:10:42 +0100 Subject: [PATCH 1/3] e2e/aks-runtime: only fetch pods for test container Before, when another pod was deployed into the same namespace because of our logging architecture in the CI, the test failed. --- e2e/aks-runtime/aks_runtime_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/aks-runtime/aks_runtime_test.go b/e2e/aks-runtime/aks_runtime_test.go index 6738d84926..3a5c5922e4 100644 --- a/e2e/aks-runtime/aks_runtime_test.go +++ b/e2e/aks-runtime/aks_runtime_test.go @@ -118,10 +118,10 @@ func TestAKSRuntime(t *testing.T) { } }) - pods, err := c.Client.CoreV1().Pods(namespace).List(ctx, metav1.ListOptions{}) + pods, err := c.PodsFromDeployment(ctx, namespace, testContainer) require.NoError(err) - require.Len(pods.Items, 1) - pod := pods.Items[0] // only one pod was deployed + require.Len(pods, 1) + pod := pods[0] logs, err := c.Client.CoreV1().Pods(namespace).GetLogs(pod.Name, &corev1.PodLogOptions{}).DoRaw(ctx) require.NoError(err) From daf896dae95f800f72fbea57d0f4dabad63de9f6 Mon Sep 17 00:00:00 2001 From: Markus Rudy Date: Mon, 9 Dec 2024 08:16:57 +0100 Subject: [PATCH 2/3] ci: add default_platform to AKS test --- .github/workflows/e2e_aks_runtime.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/e2e_aks_runtime.yml b/.github/workflows/e2e_aks_runtime.yml index 54ee539958..c80b515c61 100644 --- a/.github/workflows/e2e_aks_runtime.yml +++ b/.github/workflows/e2e_aks_runtime.yml @@ -40,6 +40,7 @@ jobs: cat < justfile.env container_registry=${{ env.container_registry }} azure_resource_group=${{ env.azure_resource_group }} + default_platform=AKS-CLH-SNP EOF - name: Get credentials for CI cluster run: | @@ -52,7 +53,7 @@ jobs: echo "SYNC_FIFO_UUID=$sync_uuid" | tee -a "$GITHUB_ENV" - name: Build and prepare deployments run: | - nix shell .#just --command just coordinator initializer port-forwarder openssl cryptsetup service-mesh-proxy node-installer AKS-CLH-SNP + nix shell .#just --command just coordinator initializer port-forwarder openssl cryptsetup service-mesh-proxy node-installer # steps taken from https://learn.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt#option-2-step-by-step-installation-instructions - name: Install `az` with extensions run: | From f1af8ecb2f68d0cec166c394211587204ffbc1cc Mon Sep 17 00:00:00 2001 From: Markus Rudy Date: Mon, 9 Dec 2024 09:19:42 +0100 Subject: [PATCH 3/3] ci: execute AKS test on changes to itself --- .github/workflows/e2e_aks_runtime.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/e2e_aks_runtime.yml b/.github/workflows/e2e_aks_runtime.yml index c80b515c61..c7ae37188a 100644 --- a/.github/workflows/e2e_aks_runtime.yml +++ b/.github/workflows/e2e_aks_runtime.yml @@ -6,6 +6,7 @@ on: - cron: "16 6 * * 6" # 6:16 on Saturdays pull_request: paths: + - .github/workflows/e2e_aks_runtime.yml - e2e/aks-runtime/** env: