From 5d4d720647065dd2132205146d4e015acc22b7cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 6 Apr 2023 18:37:21 +0200 Subject: [PATCH] Revert "gha: k8s-on-aks: Fix cluster name" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 85cc5bb5343cdb46f3abc80a9134820a3f694474. Unfortunately we have to revert the PRs related to the switch done to using `workflow_run` instead of `pull_request_target`. The reason for that being that we can only mark jobs as required if they are targetting PRs. 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 5c5e51071d..b444d8db95 100644 --- a/.github/workflows/run-k8s-tests-on-aks.yaml +++ b/.github/workflows/run-k8s-tests-on-aks.yaml @@ -30,7 +30,7 @@ jobs: - name: Create AKS cluster to test ${{ matrix.vmm }} uses: ./.github/workflows-create-aks.yaml with: - name: ${{ inputs.checkout-ref }}-${{ matrix.vmm }}-amd64 + name: ${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }}-${{ matrix.vmm }}-amd64 - uses: actions/checkout@v3 with: @@ -54,7 +54,7 @@ jobs: - name: Download credentials for the Kubernetes CLI to use them run: | - az aks get-credentials -g "kataCI" -n ${{ inputs.checkout-ref }}-${{ matrix.vmm }}-amd64 + az aks get-credentials -g "kataCI" -n ${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }}-${{ matrix.vmm }}-amd64 - name: Deploy kata-deploy run: | @@ -81,4 +81,4 @@ jobs: if: always() uses: ./.github/workflows/delete-aks.yaml with: - name: ${{ inputs.checkout-ref }}-${{ matrix.vmm }}-amd64 + name: ${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }}-${{ matrix.vmm }}-amd64