Skip to content

Commit 2e9759e

Browse files
copilot suggested changes
1 parent 52bfbca commit 2e9759e

6 files changed

Lines changed: 19 additions & 20 deletions

File tree

.github/workflows/deploy-linux.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- dev
77
- demo
88
schedule:
9-
- cron: "0 10,22 * * *" # Runs at 10:00 AM and 10:00 PM GMT
9+
- cron: "0 10,22 * * *" # Runs at 10:00 AM and 10:00 PM UTC
1010

1111
workflow_dispatch:
1212
inputs:
@@ -74,9 +74,9 @@ jobs:
7474
with:
7575
azure_location: ${{ github.event.inputs.azure_location || 'australiaeast' }}
7676
resource_group_name: ${{ github.event.inputs.resource_group_name || '' }}
77-
waf_enabled: ${{ github.event.inputs.waf_enabled == 'true' }}
78-
EXP: ${{ github.event.inputs.EXP == 'true' }}
79-
cleanup_resources: ${{ github.event.inputs.cleanup_resources == 'true' }}
77+
waf_enabled: ${{ github.event.inputs.waf_enabled }}
78+
EXP: ${{ github.event.inputs.EXP }}
79+
cleanup_resources: ${{ github.event.inputs.cleanup_resources }}
8080
run_e2e_tests: ${{ github.event.inputs.run_e2e_tests || 'GoldenPath-Testing' }}
8181
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID || '' }}
8282
existing_webapp_url: ${{ github.event.inputs.existing_webapp_url || '' }}

.github/workflows/deploy-orchestrator.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
secrets: inherit
6969

7070
e2e-test:
71-
if: "!cancelled() && ((needs.deploy.result == 'success' && needs.deploy.outputs.WEB_APPURL != '') || (inputs.existing_webapp_url != '' && inputs.existing_webapp_url != null)) && (inputs.trigger_type != 'workflow_dispatch' || (inputs.run_e2e_tests != 'None' && inputs.run_e2e_tests != '' && inputs.run_e2e_tests != null))"
71+
if: "!cancelled() && ((needs.deploy.outputs.WEB_APPURL != '' && needs.deploy.outputs.WEB_APPURL != null) || (inputs.existing_webapp_url != '' && inputs.existing_webapp_url != null)) && (inputs.trigger_type != 'workflow_dispatch' || (inputs.run_e2e_tests != 'None' && inputs.run_e2e_tests != '' && inputs.run_e2e_tests != null))"
7272
needs: [deploy]
7373
uses: ./.github/workflows/test-automation-v2.yml
7474
with:

.github/workflows/job-cleanup-deployment.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ jobs:
8282
if: always()
8383
shell: bash
8484
run: |
85-
azd auth logout || true
8685
az logout || echo "Warning: Failed to logout from Azure CLI"
8786
echo "Logged out from Azure."
8887

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ jobs:
7676
fi
7777
7878
# Ensure prerequisites are present
79-
sudo apt-get update
80-
sudo apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release
79+
sudo apt-get update
80+
sudo apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release
8181
8282
# Ensure keyrings dir exists
8383
sudo mkdir -p /usr/share/keyrings

.github/workflows/job-deploy.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,10 @@ jobs:
172172
id: set_region
173173
shell: bash
174174
run: |
175+
if [[ -z "$VALID_REGION" ]]; then
176+
echo "❌ ERROR: VALID_REGION is not set. The quota check script (Deployment/checkquota.ps1) must set this variable before this step runs." >&2
177+
exit 1
178+
fi
175179
echo "Selected Region from Quota Check: $VALID_REGION"
176180
echo "AZURE_ENV_OPENAI_LOCATION=$VALID_REGION" >> $GITHUB_ENV
177181
echo "AZURE_ENV_OPENAI_LOCATION=$VALID_REGION" >> $GITHUB_OUTPUT
@@ -225,18 +229,6 @@ jobs:
225229
echo "RESOURCE_GROUP_NAME=$RESOURCE_GROUP_NAME" >> $GITHUB_OUTPUT
226230
echo "RESOURCE_GROUP_NAME=$RESOURCE_GROUP_NAME" >> $GITHUB_ENV
227231
228-
- name: Generate Unique Solution Prefix
229-
id: generate_solution_prefix
230-
shell: bash
231-
run: |
232-
set -e
233-
COMMON_PART="psldg"
234-
TIMESTAMP=$(date +%s)
235-
UPDATED_TIMESTAMP=$(echo $TIMESTAMP | tail -c 6)
236-
UNIQUE_SOLUTION_PREFIX="${COMMON_PART}${UPDATED_TIMESTAMP}"
237-
echo "SOLUTION_PREFIX=${UNIQUE_SOLUTION_PREFIX}" >> $GITHUB_ENV
238-
echo "Generated SOLUTION_PREFIX: ${UNIQUE_SOLUTION_PREFIX}"
239-
240232
- name: Determine Docker Image Tag
241233
id: determine_image_tag
242234
run: |

.github/workflows/test-automation-v2.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,14 @@ jobs:
6363
echo "ERROR: No URL provided for testing"
6464
exit 1
6565
fi
66+
67+
# Validate test suite is implemented
68+
if [ "${{ env.test_suite }}" == "Smoke-Testing" ]; then
69+
echo "ERROR: Smoke-Testing is not yet implemented"
70+
echo "Available test suites: GoldenPath-Testing"
71+
exit 1
72+
fi
73+
6674
echo "Testing URL: ${{ env.url }}"
6775
echo "Test Suite: ${{ env.test_suite }}"
6876

0 commit comments

Comments
 (0)