fix: updated the testcases and resolve the conflict

.azdo/pipelines/azure-dev.yml

@@ -9,7 +9,6 @@ trigger:
       - src/*
       - infra/*
       - azure.yaml
-      - azure_custom.yaml
       - .azdo/pipelines/azure-dev.yml
     exclude:
       - '*.md'

.github/workflows/deploy-waf.yml

@@ -12,7 +12,6 @@ on:
       - 'src/**'
       - 'infra/**'
       - 'azure.yaml'
-      - 'azure_custom.yaml'
       - '.github/workflows/deploy-waf.yml'
   schedule:
     - cron: "0 11,23 * * *" # Runs at 11:00 AM and 11:00 PM GMT

.github/workflows/docker-build-and-push.yml

@@ -18,7 +18,6 @@ on:
       - 'infra/scripts/**'
       - '.github/workflows/deploy.yml'
       - 'azure.yaml'
-      - 'azure_custom.yaml'
   pull_request:
     types:
       - opened
@@ -41,7 +40,6 @@ on:
       - 'infra/scripts/**'
       - '.github/workflows/deploy.yml'
       - 'azure.yaml'
-      - 'azure_custom.yaml'
   workflow_dispatch:
 
 permissions:

azure.yaml

@@ -1,7 +1,7 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/Azure/azure-dev/main/schemas/v1.0/azure.yaml.json
 name: multi-agent-custom-automation-engine-solution-accelerator
-# metadata:
-#   template: multi-agent-custom-automation-engine-solution-accelerator@1.0
+metadata:
+  template: multi-agent-custom-automation-engine-solution-accelerator@1.0
 requiredVersions:
   azd: '>= 1.18.0 != 1.23.9'
 hooks:

docs/DeploymentGuide.md

@@ -354,7 +354,7 @@ The `azd up` deployment output includes a ready-to-use bash script command. Look
 
 - **For Bash (Linux/macOS/WSL):**
    ```bash
-   bash ./infra/scripts/build_and_push_images.sh
+   bash ./infra/scripts/post-provision/build_and_push_images.sh
    ```
 - **For PowerShell (Windows):**
    ```powershell
@@ -399,18 +399,18 @@ The images are **built remotely in ACR** using `az acr build`, so no local Docke
 Once both scripts complete, access your deployed frontend application at the URL printed by the `postdeploy` hook (`https://<webSiteDefaultHostname>`), or retrieve it from the Azure Portal as described in [Step 4.3](#43-get-application-url).
 
 
-### 5.3 Configure Authentication (Optional)
+### 5.4 Configure Authentication (Optional)
 
 1. Follow [App Authentication Configuration](./azure_app_service_auth_setup.md)
 2. Wait up to 10 minutes for authentication changes to take effect
 
-### 5.4 Verify Deployment
+### 5.5 Verify Deployment
 
 1. Access your application using the URL from Step 4.3
 2. Confirm the application loads successfully
 <!-- 3. Verify you can sign in with your authenticated account -->
 
-### 5.5 Test the Application
+### 5.6 Test the Application
 
 **Quick Test Steps:**
 
@@ -551,30 +551,3 @@ Now that your deployment is complete and tested, explore these resources to enha
 - 🐛 **Issues:** Check [Troubleshooting Guide](./TroubleShootingSteps.md)
 - 💬 **Support:** Review [Support Guidelines](../SUPPORT.md)
 - 🔧 **Development:** See [Contributing Guide](../CONTRIBUTING.md)
-
-## Advanced: Deploy Local Changes
-
-If you've made local modifications to the code and want to deploy them to Azure, follow these steps to swap the configuration files:
-
-> **Note:** To set up and run the application locally for development, see the [Local Development Setup Guide](./LocalDevelopmentSetup.md).
-
-### Step 1: Rename Azure Configuration Files
-
-**In the root directory:**
-1. Rename `azure.yaml` to `azure_custom2.yaml`
-2. Rename `azure_custom.yaml` to `azure.yaml`
-
-### Step 2: Rename Infrastructure Files
-
-**In the `infra` directory:**
-1. Rename `main.bicep` to `main_custom2.bicep`
-2. Rename `main_custom.bicep` to `main.bicep`
-
-### Step 3: Deploy Changes
-
-Run the deployment command:
-```shell
-azd up
-```
-
-> **Note:** These custom files are configured to deploy your local code changes instead of pulling from the GitHub repository.