From 85cc5bb5343cdb46f3abc80a9134820a3f694474 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 6 Apr 2023 08:41:51 +0200 Subject: [PATCH] gha: k8s-on-aks: Fix cluster name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was missed from the last series, as GHA will use the "target branch" yaml file to start the workflow. Basically we changed the name of the cluster created to stop relying on the PR number, as that's not easily accessible on `workflow_run`. Fixes: #6611 Signed-off-by: Fabiano Fidêncio --- .github/workflows/run-k8s-tests-on-aks.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-k8s-tests-on-aks.yaml b/.github/workflows/run-k8s-tests-on-aks.yaml index 5beca17a45..371fd05a8e 100644 --- a/.github/workflows/run-k8s-tests-on-aks.yaml +++ b/.github/workflows/run-k8s-tests-on-aks.yaml @@ -26,7 +26,7 @@ jobs: - qemu uses: ./.github/workflows/create-aks.yaml with: - name: ${{ github.event.pull_request.number }}-${{ github.sha }}-${{ matrix.vmm }}-amd64 + name: ${{ inputs.checkout-ref }}-${{ matrix.vmm }}-amd64 secrets: inherit run-k8s-tests: @@ -62,7 +62,7 @@ jobs: - name: Download credentials for the Kubernetes CLI to use them run: | - az aks get-credentials -g "kataCI" -n ${{ github.event.pull_request.number }}-${{ github.sha }}-${{ matrix.vmm }}-amd64 + az aks get-credentials -g "kataCI" -n ${{ inputs.checkout-ref }}-${{ matrix.vmm }}-amd64 - name: Deploy kata-deploy run: | @@ -96,5 +96,5 @@ jobs: if: always() uses: ./.github/workflows/delete-aks.yaml with: - name: ${{ github.event.pull_request.number }}-${{ github.sha }}-${{ matrix.vmm }}-amd64 + name: ${{ inputs.checkout-ref }}-${{ matrix.vmm }}-amd64 secrets: inherit