Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: specify location when creating ACR #414

Merged
merged 4 commits into from
Jun 22, 2024
Merged

fix: specify location when creating ACR #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e060e18
fix: specify location when creating ACR
tallaxes Jun 20, 2024
1e03514
fix: try southcentralus
tallaxes Jun 20, 2024
d7afc53
Merge branch 'main' into tallaxes/ci-acr
tallaxes Jun 21, 2024
f5646a8
Merge branch 'main' into tallaxes/ci-acr
tallaxes Jun 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/e2e-matrix-trigger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
location:
type: string
description: "the azure location to run the e2e test in"
default: "eastus"
default: "southcentralus"
push:
branches: [main]
workflow_run:
Expand All @@ -23,7 +23,7 @@ jobs:
permissions:
contents: read
id-token: write # This is required for requesting the JWT
statuses: write # ./.github/actions/commit-status/*
statuses: write # ./.github/actions/commit-status/*
needs: [resolve]
uses: ./.github/workflows/e2e-matrix.yaml
with:
Expand All @@ -32,4 +32,4 @@ jobs:
secrets:
E2E_CLIENT_ID: ${{ secrets.E2E_CLIENT_ID }}
E2E_TENANT_ID: ${{ secrets.E2E_TENANT_ID }}
E2E_SUBSCRIPTION_ID: ${{ secrets.E2E_SUBSCRIPTION_ID }}
E2E_SUBSCRIPTION_ID: ${{ secrets.E2E_SUBSCRIPTION_ID }}
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
location:
type: string
description: "the azure location to run the e2e test in"
default: "eastus"
default: "southcentralus"
# k8s_version:
# type: string
# default: "1.27"
Expand All @@ -40,7 +40,7 @@ jobs:
permissions:
contents: read
id-token: write # This is required for requesting the JWT
statuses: write # ./.github/actions/commit-status/*
statuses: write # ./.github/actions/commit-status/*
env:
AZURE_SUBSCRIPTION_ID: ${{ secrets.E2E_SUBSCRIPTION_ID }}
steps:
Expand Down
3 changes: 2 additions & 1 deletion Makefile-az.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ az-mkrg: ## Create resource group
fi

az-mkacr: az-mkrg ## Create test ACR
az acr create --name $(AZURE_ACR_NAME) --resource-group $(AZURE_RESOURCE_GROUP) --sku Basic --admin-enabled -o none
az acr create --name $(AZURE_ACR_NAME) --resource-group $(AZURE_RESOURCE_GROUP) --location $(AZURE_LOCATION) \
--sku Basic --admin-enabled -o none
az acr login --name $(AZURE_ACR_NAME)

az-mkaks: az-mkacr ## Create test AKS cluster (with --vm-set-type AvailabilitySet for compatibility with standalone VMs)
Expand Down