From ff785dcdfaa0327c611166f3aa71fa65c22fa519 Mon Sep 17 00:00:00 2001
From: Aswin Nagarajan <anagarajan@microsoft.com>
Date: Wed, 22 Nov 2023 08:23:55 -0800
Subject: [PATCH] setting location

---
 ...odels-azure_openai-oai-v2-openai_completions_finetune.yml | 1 -
 ...els-azure_openai-oai-v2-openai_chat_finetune_pipeline.yml | 1 -
 infra/bootstrapping/bootstrap_oai_v2.sh                      | 5 +++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cli-foundation-models-azure_openai-oai-v2-openai_completions_finetune.yml b/.github/workflows/cli-foundation-models-azure_openai-oai-v2-openai_completions_finetune.yml
index b1faeffbc22..1ff21e3a665 100644
--- a/.github/workflows/cli-foundation-models-azure_openai-oai-v2-openai_completions_finetune.yml
+++ b/.github/workflows/cli-foundation-models-azure_openai-oai-v2-openai_completions_finetune.yml
@@ -35,7 +35,6 @@ jobs:
       - name: bootstrap resources
         run: |
           export RUN_BOOTSTRAP='true'
-          export LOCATION="northcentralus"
           echo '${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}';
           bash bootstrap_oai_v2.sh
         working-directory: infra/bootstrapping
diff --git a/.github/workflows/sdk-foundation-models-azure_openai-oai-v2-openai_chat_finetune_pipeline.yml b/.github/workflows/sdk-foundation-models-azure_openai-oai-v2-openai_chat_finetune_pipeline.yml
index 8c8484243f7..0dc248274d6 100644
--- a/.github/workflows/sdk-foundation-models-azure_openai-oai-v2-openai_chat_finetune_pipeline.yml
+++ b/.github/workflows/sdk-foundation-models-azure_openai-oai-v2-openai_chat_finetune_pipeline.yml
@@ -41,7 +41,6 @@ jobs:
     - name: bootstrap resources
       run: |
           export RUN_BOOTSTRAP='true'
-          export LOCATION="northcentralus"
           echo '${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}';
           bash bootstrap_oai_v2.sh
       working-directory: infra/bootstrapping
diff --git a/infra/bootstrapping/bootstrap_oai_v2.sh b/infra/bootstrapping/bootstrap_oai_v2.sh
index e096ddfa050..b71c72b1bdf 100644
--- a/infra/bootstrapping/bootstrap_oai_v2.sh
+++ b/infra/bootstrapping/bootstrap_oai_v2.sh
@@ -71,6 +71,7 @@ echo_title "RESOURCE_GROUP_NAME = \"${RESOURCE_GROUP_NAME}\" & LOCATION=\"${LOCA
 az configure --defaults group="${RESOURCE_GROUP_NAME}" workspace="${WORKSPACE_NAME}" location="${LOCATION}"  # for subsequent commands.
 az account set -s "${SUBSCRIPTION_ID}" || exit 1
 
+LOCATION=${LOCATION:-"northcentralus"}
 
 # RUN_BOOTSTRAP=1
 if [[ ! -z "${RUN_BOOTSTRAP:-}" ]]; then
@@ -82,8 +83,8 @@ if [[ ! -z "${RUN_BOOTSTRAP:-}" ]]; then
     "$SCRIPT_DIR"/sdk_helpers.sh ensure_ml_workspace "mlw-mevnet"
     "$SCRIPT_DIR"/sdk_helpers.sh ensure_vnet "vnet-mevnet"
     "$SCRIPT_DIR"/sdk_helpers.sh ensure_subnet "vnet-mevnet" "snet-scoring"
-    "$SCRIPT_DIR"/sdk_helpers.sh ensure_identity "uaimevnet"
-    "$SCRIPT_DIR"/sdk_helpers.sh grant_permission_identity_on_acr "uaimevnet"
+    "$SCRIPT_DIR"/sdk_helpers.sh ensure_identity "uaimevnet-oai-v2"
+    "$SCRIPT_DIR"/sdk_helpers.sh grant_permission_identity_on_acr "uaimevnet-oai-v2"
 
     echo_title "Ensuring Permissions on RG"
     "$SCRIPT_DIR"/sdk_helpers.sh grant_permission_app_id_on_rg "${APP_NAME}"