From 3c189d49f3cd4b0299fd9fe4d82d629939e00ae1 Mon Sep 17 00:00:00 2001 From: Heba Elayoty Date: Wed, 17 Jan 2024 15:19:42 -0800 Subject: [PATCH] Fix e2e pipeline Signed-off-by: Heba Elayoty --- .github/workflows/aks-addon-tests.yml | 13 ++++--------- .github/workflows/e2e-tests.yml | 14 ++++---------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/.github/workflows/aks-addon-tests.yml b/.github/workflows/aks-addon-tests.yml index cce3454c..e5709b8c 100644 --- a/.github/workflows/aks-addon-tests.yml +++ b/.github/workflows/aks-addon-tests.yml @@ -5,7 +5,7 @@ concurrency: cancel-in-progress: true on: - pull_request_target: + pull_request: branches: [master] paths-ignore: ['docs/**', '**.md', '**.mdx', '**.png', '**.jpg'] push: @@ -23,7 +23,7 @@ env: jobs: export-registry: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest outputs: registry: ${{ steps.export.outputs.registry }} steps: @@ -38,7 +38,7 @@ jobs: env: REGISTRY: ${{ needs.export-registry.outputs.registry }} E2E_IMG_TAG: "e2e-ci" - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Set up Go ${{ env.GO_VERSION }} uses: actions/setup-go@v5 @@ -65,12 +65,7 @@ jobs: echo "CLUSTER_NAME=aks-addon-vk-test${rand}" >> $GITHUB_ENV - - name: Install Azure CLI latest - run: | - curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash - az version - - - uses: azure/login@v1.5.1 + - uses: azure/login@v1.4.7 with: client-id: ${{ secrets.CLIENTID }} tenant-id: ${{ secrets.TENANT_ID }} diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index ab449977..79462ee9 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -5,8 +5,7 @@ concurrency: cancel-in-progress: true on: - workflow_dispatch: - pull_request_target: + pull_request: branches: - master - release-** @@ -26,7 +25,7 @@ env: jobs: export-registry: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest outputs: registry: ${{ steps.export.outputs.registry }} steps: @@ -41,7 +40,7 @@ jobs: env: REGISTRY: ${{ needs.export-registry.outputs.registry }} E2E_IMG_TAG: "e2e-ci" - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Set up Go ${{ env.GO_VERSION }} uses: actions/setup-go@v5 @@ -68,12 +67,7 @@ jobs: echo "CLUSTER_NAME=vk-aci-test${rand}" >> $GITHUB_ENV - - name: Install Azure CLI latest - run: | - curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash - az version - - - uses: azure/login@v1.5.1 + - uses: azure/login@v1.5.0 with: client-id: ${{ secrets.CLIENTID }} tenant-id: ${{ secrets.TENANT_ID }}