From 0b3190ea8be6ab93c4a43e413483ad2ee3bd62e3 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Sat, 15 Apr 2023 19:24:48 +0200
Subject: [PATCH] ci: fix naming issues (#1662)

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 .github/actions/e2e_sonobuoy/action.yml | 4 ++--
 .github/actions/e2e_test/action.yml     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/actions/e2e_sonobuoy/action.yml b/.github/actions/e2e_sonobuoy/action.yml
index 093c2d48f..1d7f14a25 100644
--- a/.github/actions/e2e_sonobuoy/action.yml
+++ b/.github/actions/e2e_sonobuoy/action.yml
@@ -47,13 +47,13 @@ runs:
       uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
       with:
         name: "sonobuoy-logs-${{ inputs.artifactNameSuffix }}.tar.gz"
-        path: "*-sonobuoy-*.tar.gz"
+        path: "*_sonobuoy_*.tar.gz"
 
     # Only works on "sonobuoy full" tests (e2e plugin)
     - name: Extract test results
       if: (!env.ACT) && contains(inputs.sonobuoyTestSuiteCmd, '--plugin e2e')
       shell: bash
-      run: tar -xf *-sonobuoy-*.tar.gz
+      run: tar -xf *_sonobuoy_*.tar.gz
 
     - name: Publish test results
       if: (!env.ACT) && contains(inputs.sonobuoyTestSuiteCmd, '--plugin e2e')
diff --git a/.github/actions/e2e_test/action.yml b/.github/actions/e2e_test/action.yml
index fb0f00a58..b57f9af25 100644
--- a/.github/actions/e2e_test/action.yml
+++ b/.github/actions/e2e_test/action.yml
@@ -172,7 +172,8 @@ runs:
       shell: bash
       run: |
         uuid=$(uuidgen)
-        echo "uuid=${uuid%%-*}" | tee -a $GITHUB_OUTPUT
+        uuid=${uuid%%-*}
+        echo "uuid=${uuid}" | tee -a $GITHUB_OUTPUT
         echo "prefix=e2e-${{ github.run_id }}-${{ github.run_attempt }}-${uuid}" | tee -a $GITHUB_OUTPUT
 
     - name: Create IAM configuration
@@ -247,7 +248,6 @@ runs:
         # TODO: 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'
         kubeconfig: ${{ steps.constellation-create.outputs.kubeconfig }}
-        cloudProvider: ${{ inputs.cloudProvider }}
         artifactNameSuffix: ${{ steps.create-prefix.outputs.prefix }}
 
     - name: Run autoscaling test