From 918170529905b0e6fd6c13bf0afdaea7eb567e9f Mon Sep 17 00:00:00 2001
From: Malte Poll <1780588+malt3@users.noreply.github.com>
Date: Tue, 16 Jan 2024 13:19:46 +0100
Subject: [PATCH] ci: use sonobuoy 0.57.1 (#2821)

---
 .github/actions/e2e_sonobuoy/action.yml | 7 +++++--
 .github/actions/e2e_test/action.yml     | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/actions/e2e_sonobuoy/action.yml b/.github/actions/e2e_sonobuoy/action.yml
index 1628dadb8..7b87d0ee1 100644
--- a/.github/actions/e2e_sonobuoy/action.yml
+++ b/.github/actions/e2e_sonobuoy/action.yml
@@ -21,7 +21,7 @@ runs:
     - name: Install sonobuoy
       shell: bash
       env:
-        SONOBUOY_VER: "0.56.17"
+        SONOBUOY_VER: "0.57.1"
       run: |
         HOSTOS="$(go env GOOS)"
         HOSTARCH="$(go env GOARCH)"
@@ -43,7 +43,10 @@ runs:
       shell: bash
       env:
         KUBECONFIG: ${{ inputs.kubeconfig }}
-      run: sonobuoy retrieve --kubeconfig constellation-admin.conf
+      run: |
+        sonobuoy retrieve --kubeconfig constellation-admin.conf
+        sonobuoy results *_sonobuoy_*.tar.gz
+        sonobuoy results *_sonobuoy_*.tar.gz --mode detailed | jq 'select(.status!="passed")' | jq 'select(.status!="skipped")' || true
 
     - name: Upload test results
       if: always() && !env.ACT
diff --git a/.github/actions/e2e_test/action.yml b/.github/actions/e2e_test/action.yml
index c0b336fe5..99452fa46 100644
--- a/.github/actions/e2e_test/action.yml
+++ b/.github/actions/e2e_test/action.yml
@@ -341,7 +341,7 @@ runs:
       uses: ./.github/actions/e2e_sonobuoy
       with:
         # TODO(3u13r): Remove E2E_SKIP once AB#2174 is resolved
-        sonobuoyTestSuiteCmd: '--plugin e2e --plugin-env e2e.E2E_FOCUS="\[Conformance\]" --plugin-env e2e.E2E_SKIP="for service with type clusterIP|HostPort validates that there is no conflict between pods with same hostPort but different hostIP and protocol" --plugin https://raw.githubusercontent.com/vmware-tanzu/sonobuoy-plugins/master/cis-benchmarks/kube-bench-plugin.yaml --plugin https://raw.githubusercontent.com/vmware-tanzu/sonobuoy-plugins/master/cis-benchmarks/kube-bench-master-plugin.yaml'
+        sonobuoyTestSuiteCmd: '--plugin e2e --plugin-env e2e.E2E_FOCUS="\[Conformance\]" --plugin-env e2e.E2E_SKIP="for service with type clusterIP|HostPort validates that there is no conflict between pods with same hostPort but different hostIP and protocol|Services should serve endpoints on same port and different protocols" --plugin https://raw.githubusercontent.com/vmware-tanzu/sonobuoy-plugins/master/cis-benchmarks/kube-bench-plugin.yaml --plugin https://raw.githubusercontent.com/vmware-tanzu/sonobuoy-plugins/master/cis-benchmarks/kube-bench-master-plugin.yaml'
         kubeconfig: ${{ steps.constellation-create.outputs.kubeconfig }}
         artifactNameSuffix: ${{ steps.create-prefix.outputs.prefix }}
         encryptionSecret: ${{ inputs.encryptionSecret }}