Skip to content

Commit 54beb0b

Browse files
Vamshi-MicrosoftVamshi-Microsoft
committed
fix: Refactor Azure CLI setup and environment variable handling in workflow files
1 parent 779468f commit 54beb0b

6 files changed

Lines changed: 30 additions & 67 deletions

File tree

‎.github/workflows/bicep_deploy.yml‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414

1515
- name: Run Quota Check
1616
id: quota-check
17+
env:
18+
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
19+
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
20+
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
21+
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
22+
GPT_MIN_CAPACITY: "30"
23+
AZURE_REGIONS: ${{ vars.AZURE_REGIONS }}
1724
run: |
18-
export AZURE_CLIENT_ID=${{ secrets.AZURE_CLIENT_ID }}
19-
export AZURE_TENANT_ID=${{ secrets.AZURE_TENANT_ID }}
20-
export AZURE_CLIENT_SECRET=${{ secrets.AZURE_CLIENT_SECRET }}
21-
export AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
22-
export GPT_MIN_CAPACITY="30"
23-
export AZURE_REGIONS="${{ vars.AZURE_REGIONS }}"
24-
2525
chmod +x infra/scripts/checkquota_ckmv2.sh
2626
if ! infra/scripts/checkquota_ckmv2.sh; then
2727
# If quota check fails due to insufficient quota, set the flag
@@ -55,11 +55,6 @@ jobs:
5555
echo "Selected Region: $VALID_REGION"
5656
echo "AZURE_LOCATION=$VALID_REGION" >> $GITHUB_ENV
5757
58-
- name: Setup Azure CLI
59-
run: |
60-
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
61-
az --version # Verify installation
62-
6358
- name: Login to Azure
6459
run: |
6560
az login --service-principal -u ${{ secrets.AZURE_CLIENT_ID }} -p ${{ secrets.AZURE_CLIENT_SECRET }} --tenant ${{ secrets.AZURE_TENANT_ID }}

‎.github/workflows/deploy-KMGeneric.yml‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,21 @@ jobs:
3131
steps:
3232
- name: Checkout Code
3333
uses: actions/checkout@v5
34-
- name: Setup Azure CLI
35-
run: |
36-
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
37-
az --version
34+
3835
- name: Login to Azure
3936
run: |
4037
az login --service-principal -u ${{ secrets.AZURE_CLIENT_ID }} -p ${{ secrets.AZURE_CLIENT_SECRET }} --tenant ${{ secrets.AZURE_TENANT_ID }}
4138
- name: Run Quota Check
4239
id: quota-check
40+
env:
41+
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
42+
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
43+
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
44+
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
45+
GPT_MIN_CAPACITY: ${{ env.GPT_MIN_CAPACITY }}
46+
TEXT_EMBEDDING_MIN_CAPACITY: ${{ env.TEXT_EMBEDDING_MIN_CAPACITY }}
47+
AZURE_REGIONS: ${{ vars.AZURE_REGIONS_KM }}
4348
run: |
44-
export AZURE_CLIENT_ID=${{ secrets.AZURE_CLIENT_ID }}
45-
export AZURE_TENANT_ID=${{ secrets.AZURE_TENANT_ID }}
46-
export AZURE_CLIENT_SECRET=${{ secrets.AZURE_CLIENT_SECRET }}
47-
export AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
48-
export GPT_MIN_CAPACITY=${{ env.GPT_MIN_CAPACITY }}
49-
export TEXT_EMBEDDING_MIN_CAPACITY=${{ env.TEXT_EMBEDDING_MIN_CAPACITY }}
50-
export AZURE_REGIONS="${{ vars.AZURE_REGIONS_KM }}"
5149
chmod +x infra/scripts/checkquota_km.sh
5250
if ! infra/scripts/checkquota_km.sh; then
5351
# If quota check fails due to insufficient quota, set the flag
@@ -196,10 +194,6 @@ jobs:
196194
env:
197195
RESOURCE_GROUP_NAME: ${{ needs.deploy.outputs.RESOURCE_GROUP_NAME }}
198196
steps:
199-
- name: Setup Azure CLI
200-
run: |
201-
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
202-
az --version
203197
- name: Login to Azure
204198
run: |
205199
az login --service-principal -u ${{ secrets.AZURE_CLIENT_ID }} -p ${{ secrets.AZURE_CLIENT_SECRET }} --tenant ${{ secrets.AZURE_TENANT_ID }}

‎.github/workflows/job-azure-deploy.yml‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -310,11 +310,6 @@ jobs:
310310
- name: Checkout Code
311311
uses: actions/checkout@v4
312312

313-
- name: Setup Azure CLI
314-
run: |
315-
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
316-
az --version
317-
318313
- name: Login to Azure
319314
shell: bash
320315
run: |
@@ -323,22 +318,22 @@ jobs:
323318
324319
- name: Run Quota Check
325320
id: quota-check
326-
shell: bash
321+
env:
322+
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
323+
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
324+
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
325+
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
326+
GPT_MIN_CAPACITY: ${{ env.GPT_MIN_CAPACITY }}
327+
TEXT_EMBEDDING_MIN_CAPACITY: ${{ env.TEXT_EMBEDDING_MIN_CAPACITY }}
328+
AZURE_REGIONS: ${{ vars.AZURE_REGIONS_KM }}
327329
run: |
328-
export AZURE_CLIENT_ID=${{ secrets.AZURE_CLIENT_ID }}
329-
export AZURE_TENANT_ID=${{ secrets.AZURE_TENANT_ID }}
330-
export AZURE_CLIENT_SECRET=${{ secrets.AZURE_CLIENT_SECRET }}
331-
export AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
332-
export GPT_MIN_CAPACITY=${{ env.GPT_MIN_CAPACITY }}
333-
export TEXT_EMBEDDING_MIN_CAPACITY=${{ env.TEXT_EMBEDDING_MIN_CAPACITY }}
334-
export AZURE_REGIONS="${{ vars.AZURE_REGIONS }}"
335-
336330
chmod +x infra/scripts/checkquota_km.sh
337331
if ! infra/scripts/checkquota_km.sh; then
332+
# If quota check fails due to insufficient quota, set the flag
338333
if grep -q "No region with sufficient quota found" infra/scripts/checkquota_km.sh; then
339334
echo "QUOTA_FAILED=true" >> $GITHUB_ENV
340335
fi
341-
exit 1
336+
exit 1 # Fail the pipeline if any other failure occurs
342337
fi
343338
344339
- name: Fail Pipeline if Quota Check Fails

‎.github/workflows/job-cleanup-resources.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,6 @@ jobs:
5353
ENV_NAME: ${{ inputs.env_name }}
5454
IMAGE_TAG: ${{ inputs.image_tag }}
5555
steps:
56-
- name: Setup Azure CLI
57-
shell: bash
58-
run: |
59-
if [[ "${{ runner.os }}" == "Linux" ]]; then
60-
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
61-
fi
62-
az --version
63-
6456
- name: Login to Azure
6557
shell: bash
6658
run: |

‎.github/workflows/job-deploy-linux.yml‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -199,18 +199,9 @@ jobs:
199199
else
200200
echo "🔧 Configuring Non-WAF deployment - using default main.parameters.json..."
201201
fi
202-
203-
- name: Setup Azure CLI
204-
shell: bash
205-
run: |
206-
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
207202
208-
- name: Setup Azure Developer CLI (Linux)
209-
if: runner.os == 'Linux'
210-
shell: bash
211-
run: |
212-
curl -fsSL https://aka.ms/install-azd.sh | sudo bash
213-
azd version
203+
- name: Install azd
204+
uses: Azure/setup-azd@v2
214205

215206
- name: Login to AZD
216207
id: login-azure
@@ -239,9 +230,6 @@ jobs:
239230
echo "EXP: $EXP"
240231
echo "Using Docker Image Tag: $IMAGE_TAG"
241232
242-
# Install azd (Azure Developer CLI)
243-
curl -fsSL https://aka.ms/install-azd.sh | bash
244-
245233
# Generate current timestamp in desired format: YYYY-MM-DDTHH:MM:SS.SSSSSSSZ
246234
current_date=$(date -u +"%Y-%m-%dT%H:%M:%S.%7NZ")
247235
@@ -304,11 +292,11 @@ jobs:
304292
exit 1
305293
fi
306294
307-
export API_APP_URL="$(echo "$DEPLOY_OUTPUT" | jq -r '.API_APP_URL // empty')"
295+
API_APP_URL="$(echo "$DEPLOY_OUTPUT" | jq -r '.API_APP_URL // empty')"
308296
echo "API_APP_URL=$API_APP_URL" >> $GITHUB_ENV
309297
echo "API_APP_URL=$API_APP_URL" >> $GITHUB_OUTPUT
310298
311-
export WEB_APP_URL="$(echo "$DEPLOY_OUTPUT" | jq -r '.WEB_APP_URL // empty')"
299+
WEB_APP_URL="$(echo "$DEPLOY_OUTPUT" | jq -r '.WEB_APP_URL // empty')"
312300
echo "WEB_APP_URL=$WEB_APP_URL" >> $GITHUB_ENV
313301
echo "WEB_APP_URL=$WEB_APP_URL" >> $GITHUB_OUTPUT
314302

‎.github/workflows/job-deploy-windows.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,6 @@ jobs:
297297
exit 1
298298
}
299299
300-
# Export variables only after successful deploy
301300
$API_APP_URL = $DEPLOY_OUTPUT.API_APP_URL
302301
"API_APP_URL=$API_APP_URL" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
303302
"API_APP_URL=$API_APP_URL" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append

0 commit comments

Comments
 (0)