feat: Use Existing AI Project Resource & Test Automation Workflow Improvements

Author: Avijit-Microsoft

.github/workflows/deploy-KMGeneric.yml

@@ -7,14 +7,28 @@ on:
       - dev
     paths:
       - 'tests/e2e-test/**'
-  schedule:
-      - cron: '0 13 * * *'  # Runs at 1 PM UTC
-  workflow_dispatch:
 
+  workflow_dispatch:
+  # NEW: Add workflow_call to make it reusable
+  workflow_call:
+    inputs:
+      KMGENERIC_URL:
+        required: false
+        type: string
+        description: "Web URL for KMGeneric (overrides environment variable)"
+      KMGENERIC_URL_API:
+        required: false
+        type: string
+        description: "API URL for KMGeneric (overrides environment variable)"
+    secrets:
+      EMAILNOTIFICATION_LOGICAPP_URL_TA:
+        required: false
+        description: "Logic App URL for email notifications"
 env:
-    url: ${{ vars.KMG_WEB_URL }}
-    api_url: ${{ vars.KMG_API_URL }}
-    accelerator_name: "KMGeneric"
+  # Use input URL if provided (from deploy pipeline), otherwise fall back to vars
+  url: ${{ inputs.KMGENERIC_URL  }}
+  api_url: ${{ inputs.KMGENERIC_URL_API}}
+  accelerator_name: "KMGeneric"
 
 jobs:
   test:
@@ -35,6 +49,40 @@ jobs:
 
       - name: Ensure browsers are installed
         run: python -m playwright install --with-deps chromium
+      - name: Validate URL
+        run: |
+          if [ -z "${{ env.url }}" ]; then
+            echo "ERROR: No URL provided for testing"
+            exit 1
+          elif [ -z "${{ env.api_url }}" ]; then
+            echo "ERROR: No API URL provided for testing"
+            exit 1
+          fi
+          echo "Testing URL: ${{ env.url }}"
+          echo "Testing API URL: ${{ env.api_url }}"
+      - name: Wait for Application to be Ready
+        run: |
+          echo "Waiting for application to be ready at ${{ env.url }} "
+          max_attempts=10
+          attempt=1
+          
+          while [ $attempt -le $max_attempts ]; do
+            echo "Attempt $attempt: Checking if application is ready..."
+            if curl -f -s "${{ env.url }}" > /dev/null; then
+              echo "Application is ready!"
+              break
+            fi
+            
+            if [ $attempt -eq $max_attempts ]; then
+              echo "Application is not ready after $max_attempts attempts"
+              exit 1
+            fi
+            
+            echo "Application not ready, waiting 30 seconds..."
+            sleep 30
+            attempt=$((attempt + 1))
+          done
+
 
       - name: Run tests(1)
         id: test1
@@ -73,34 +121,57 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ !cancelled() }}
         with:
-          name: test-report
+
+          name: test-report-${{ github.run_id }}
           path: tests/e2e-test/report/*
+      - name: Determine Test Result
+        id: test_result
+        run: |
+          IS_SUCCESS=${{ steps.test1.outcome == 'success' || steps.test2.outcome == 'success' || steps.test3.outcome == 'success' }}
+          echo "IS_SUCCESS=$IS_SUCCESS" >> $GITHUB_OUTPUT
+          
+          if [ "$IS_SUCCESS" = "true" ]; then
+            echo "✅ Tests passed!"
+          else
+            echo "❌ All test attempts failed"
+            exit 1
+          fi
 
       - name: Send Notification
         if: always()
         run: |
           RUN_URL="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
           REPORT_URL=${{ steps.upload_report.outputs.artifact-url }}
-          IS_SUCCESS=${{ steps.test1.outcome == 'success' || steps.test2.outcome == 'success' || steps.test3.outcome == 'success' }}
+
+          IS_SUCCESS=${{ steps.test_result.outputs.IS_SUCCESS }}
+          
+
           # Construct the email body
           if [ "$IS_SUCCESS" = "true" ]; then
             EMAIL_BODY=$(cat <<EOF
             {
-              "body": "<p>Dear Team,</p><p>We would like to inform you that the ${{ env.accelerator_name }} Test Automation process has completed successfully.</p><p><strong>Run URL:</strong> <a href=\"${RUN_URL}\">${RUN_URL}</a><br></p><p><strong>Test Report:</strong> <a href=\"${REPORT_URL}\">${REPORT_URL}</a></p><p>Best regards,<br>Your Automation Team</p>",
+
+              "body": "<p>Dear Team,</p><p>We would like to inform you that the ${{ env.accelerator_name }} Test Automation process has completed successfully.</p><p><strong>Run URL:</strong> <a href=\"${RUN_URL}\">${RUN_URL}</a><br></p><p><strong>Test Report:</strong> <a href=\"${REPORT_URL}\">${REPORT_URL}</a></p><p><strong>Tested URL:</strong> ${{ env.url }}</p><p>Best regards,<br>Your Automation Team</p>",
+
               "subject": "${{ env.accelerator_name }} Test Automation - Success"
             }
           EOF
             )
           else
             EMAIL_BODY=$(cat <<EOF
             {
-              "body": "<p>Dear Team,</p><p>We would like to inform you that the ${{ env.accelerator_name }} Test Automation process  has encountered an issue and has failed to complete successfully.</p><p><strong>Run URL:</strong> <a href=\"${RUN_URL}\">${RUN_URL}</a><br> ${OUTPUT}</p><p><strong>Test Report:</strong> <a href=\"${REPORT_URL}\">${REPORT_URL}</a></p><p>Please investigate the matter at your earliest convenience.</p><p>Best regards,<br>Your Automation Team</p>",
+
+              "body": "<p>Dear Team,</p><p>We would like to inform you that the ${{ env.accelerator_name }} Test Automation process has encountered an issue and has failed to complete successfully.</p><p><strong>Run URL:</strong> <a href=\"${RUN_URL}\">${RUN_URL}</a><br></p><p><strong>Test Report:</strong> <a href=\"${REPORT_URL}\">${REPORT_URL}</a></p><p><strong>Tested URL:</strong> ${{ env.url }}</p><p>Please investigate the matter at your earliest convenience.</p><p>Best regards,<br>Your Automation Team</p>",
+
               "subject": "${{ env.accelerator_name }} Test Automation - Failure"
             }
           EOF
             )
           fi
+
+          
           # Send the notification
-          curl -X POST "${{ secrets.EMAILNOTIFICATION_LOGICAPP_URL_TA}}" \
+          curl -X POST "${{ secrets.EMAILNOTIFICATION_LOGICAPP_URL_TA }}" \
             -H "Content-Type: application/json" \
-            -d "$EMAIL_BODY" || echo "Failed to send notification"
+            -d "$EMAIL_BODY" || echo "Failed to send notification"
+

.github/workflows/test-automation.yml

@@ -12,13 +12,13 @@ hooks:
   preprovision:
     windows:
       run: |
-        $timestamp = Get-Date -Format "yyyyMMdd-HHmmss"; $logFile = "azd_preprovision_$timestamp.log"; ./infra/scripts/docker-build.ps1 $env:AZURE_SUBSCRIPTION_ID $env:AZURE_ENV_NAME $env:AZURE_LOCATION $env:AZURE_RESOURCE_GROUP $env:USE_LOCAL_BUILD *>&1 | Tee-Object -FilePath $logFile
+        $timestamp = Get-Date -Format "yyyyMMdd-HHmmss"; $logFile = "azd_preprovision_$timestamp.log"; ./infra/scripts/docker-build.ps1 $env:AZURE_SUBSCRIPTION_ID $env:AZURE_ENV_NAME $env:AZURE_LOCATION $env:AZURE_RESOURCE_GROUP $env:USE_LOCAL_BUILD $env:AZURE_ENV_IMAGETAG *>&1 | Tee-Object -FilePath $logFile
       shell: pwsh
       continueOnError: false
       interactive: true
     posix:
       run: |
-        timestamp=$(date +"%Y%m%d-%H%M%S"); logFile="azd_preprovision_$timestamp.log"; sed -i 's/\r$//' ./infra/scripts/docker-build.sh; ./infra/scripts/docker-build.sh "$AZURE_SUBSCRIPTION_ID" "$AZURE_ENV_NAME" "$AZURE_LOCATION" "$AZURE_RESOURCE_GROUP" "$USE_LOCAL_BUILD" 2>&1 | tee "$logFile"
+        timestamp=$(date +"%Y%m%d-%H%M%S"); logFile="azd_preprovision_$timestamp.log"; sed -i 's/\r$//' ./infra/scripts/docker-build.sh; ./infra/scripts/docker-build.sh "$AZURE_SUBSCRIPTION_ID" "$AZURE_ENV_NAME" "$AZURE_LOCATION" "$AZURE_RESOURCE_GROUP" "$USE_LOCAL_BUILD" "$AZURE_ENV_IMAGETAG" 2>&1 | tee "$logFile"
       shell: sh
       continueOnError: false
       interactive: true

azure.yaml

@@ -9,7 +9,7 @@ By default this template will use the environment name as the prefix to prevent
 
 | Name                                      | Type    | Default Value            | Purpose                                                                    |
 | ----------------------------------------- | ------- | ------------------------ | -------------------------------------------------------------------------- |
-| `AZURE_LOCATION`                          | string  | ` ` *(empty)*            | Sets the Azure region for resource deployment.                             |
+| `AZURE_LOCATION`                          | string  | ` `            | Sets the Azure region for resource deployment.                             |
 | `AZURE_ENV_NAME`                          | string  | `env_name`               | Sets the environment name prefix for all Azure resources.                  |
 | `AZURE_CONTENT_UNDERSTANDING_LOCATION`    | string  | `swedencentral`          | Specifies the region for content understanding resources.                  |
 | `AZURE_SECONDARY_LOCATION`                | string  | `eastus2`                | Specifies a secondary Azure region.                                        |
@@ -21,7 +21,9 @@ By default this template will use the environment name as the prefix to prevent
 | `AZURE_OPENAI_EMBEDDING_MODEL`            | string  | `text-embedding-ada-002` | Sets the name of the embedding model to use.                               |
 | `AZURE_ENV_IMAGETAG`                      | string  | `latest`        | Sets the image tag (`latest`, `dev`, `hotfix`, etc.).   |
 | `AZURE_OPENAI_EMBEDDING_MODEL_CAPACITY`   | integer | `80`                     | Sets the capacity for the embedding model deployment.                      |
-| `AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID`    | string  | ` ` *(empty)*            | Reuses an existing Log Analytics Workspace instead of creating a new one.  |
+| `AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID`    | string  | `<Existing Workspace Id>`            | Reuses an existing Log Analytics Workspace instead of creating a new one.  |
+| `USE_LOCAL_BUILD`    | string  | `false`           | Indicates whether to use a local container build for deployment.  |
+| `AZURE_EXISTING_AI_PROJECT_RESOURCE_ID`    | string  | `<Existing AI Project resource Id>`            | Reuses an existing AIFoundry and AIFoundryProject instead of creating a new one.  |
 
 
 

documents/CustomizingAzdParameters.md

@@ -120,6 +120,7 @@ When you start the deployment, most parameters will have **default values**, but
 | **Embedding Model Capacity**                | Set the capacity for **embedding models** (in thousands).                                                 | 80k                    |
 | **Image Tag**                               | Docker image tag to deploy. Common values: `latest`, `dev`, `hotfix`.                  | latest       |
 | **Existing Log Analytics Workspace**        | To reuse an existing Log Analytics Workspace ID.                                                          | *(empty)*              |
+| **Use Local Build**                         | Boolean flag to determine if local container builds should be used.                         | false             |
 
 
 

documents/DeploymentGuide.md

@@ -19,7 +19,9 @@
     "speechService": "spch-",
     "translator": "trsl-",
     "aiHub": "aih-",
-    "aiHubProject": "aihp-"
+    "aiHubProject": "aihp-",
+    "aiFoundry": "aif-",
+    "aiFoundryProject": "aifp-"
   },
   "analytics": {
     "analysisServicesServer": "as",