Skip to content

Commit

Permalink
Fix e2e pipeline
Browse files Browse the repository at this point in the history
Signed-off-by: Heba Elayoty <hebaelayoty@gmail.com>
  • Loading branch information
helayoty committed Jan 18, 2024
1 parent 8db4813 commit c9ec8a6
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 26 deletions.
23 changes: 9 additions & 14 deletions .github/workflows/aks-addon-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ on:
branches: [master]
paths-ignore: ['docs/**', '**.md', '**.mdx', '**.png', '**.jpg']

permissions:
id-token: write
contents: read

env:
REGISTRY: ghcr.io
# Common versions
GO_VERSION: '1.20'

permissions:
id-token: write # This is required for requesting the JWT
contents: read # This is required for actions/checkout

jobs:
export-registry:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
outputs:
registry: ${{ steps.export.outputs.registry }}
steps:
Expand All @@ -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
Expand All @@ -65,16 +65,11 @@ 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
with:
client-id: ${{ secrets.CLIENTID }}
tenant-id: ${{ secrets.TENANT_ID }}
subscription-id: ${{ secrets.SUBSCRIPTIONID }}
client-id: ${{ secrets.AZURE_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}

- name: Run e2e test
run: |
Expand Down
18 changes: 6 additions & 12 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ concurrency:
cancel-in-progress: true

on:
workflow_dispatch:
pull_request_target:
pull_request:
branches:
- master
- release-**
Expand All @@ -26,7 +25,7 @@ env:

jobs:
export-registry:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
outputs:
registry: ${{ steps.export.outputs.registry }}
steps:
Expand All @@ -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
Expand All @@ -68,16 +67,11 @@ 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
with:
client-id: ${{ secrets.CLIENTID }}
tenant-id: ${{ secrets.TENANT_ID }}
subscription-id: ${{ secrets.SUBSCRIPTIONID }}
client-id: ${{ secrets.AZURE_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}

- name: Run e2e test
run: |
Expand Down

0 comments on commit c9ec8a6

Please sign in to comment.