fix resource group parameter.

Author: sivakami

.pipelines/swiftv2-long-running/pipeline.yaml

@@ -22,12 +22,12 @@ parameters:
     default: "centraluseuap"
 
   - name: resourceGroupName
-    displayName: "Resource Group Name (IMPORTANT: Change this when creating new setup to avoid collisions!)"
+    displayName: "Resource Group Name (Leave empty to auto-generate: sv2-long-run-<location>. Or provide custom name for parallel setups)"
     type: string
-    default: "sv2-long-run-${{ parameters.location }}"
+    default: ""
 
   - name: runSetupStages
-    displayName: "Create new setup(AKS + Network) - WARNING: Set resourceGroupName to unique value if creating new setup!"
+    displayName: "Create new setup(AKS + Network) - WARNING: Use unique resourceGroupName for parallel setups!"
     type: boolean
     default: false
 

.pipelines/swiftv2-long-running/template/long-running-pipeline-template.yaml

@@ -15,6 +15,13 @@ parameters:
     type: boolean
     default: false
 
+variables:
+  - name: rgName
+    ${{ if ne(parameters.resourceGroupName, '') }}:
+      value: ${{ parameters.resourceGroupName }}
+    ${{ else }}:
+      value: sv2-long-run-${{ parameters.location }}
+
 stages:
   # =================================================================
   # Stage 1: AKS Cluster and Networking Setup (Conditional)
@@ -41,9 +48,9 @@ stages:
               inlineScript: |
                 echo "Org: $SYSTEM_COLLECTIONURI"
                 echo "Project: $SYSTEM_TEAMPROJECT"
-                echo "==> Creating resource group ${{ parameters.resourceGroupName }} in ${{ parameters.location }}"
+                echo "==> Creating resource group $(rgName) in ${{ parameters.location }}"
                 az group create \
-                  --name "${{ parameters.resourceGroupName }}" \
+                  --name "$(rgName)" \
                   --location "${{ parameters.location }}" \
                   --tags SkipAutoDeleteTill=2032-12-31 \
                   --subscription "${{ parameters.subscriptionId }}"
@@ -69,7 +76,7 @@ stages:
               arguments: >
                 ${{ parameters.subscriptionId }}
                 ${{ parameters.location }}
-                ${{ parameters.resourceGroupName }}
+                $(rgName)
                 ${{ parameters.vmSkuDefault }}
                 ${{ parameters.vmSkuHighNIC }}
       
@@ -96,7 +103,7 @@ stages:
               arguments: >
                 ${{ parameters.subscriptionId }}
                 ${{ parameters.location }}
-                ${{ parameters.resourceGroupName }}
+                $(rgName)
                 $(Build.BuildId)
 
           # Task 2: Create Peerings
@@ -108,7 +115,7 @@ stages:
               scriptLocation: scriptPath
               scriptPath: ".pipelines/swiftv2-long-running/scripts/create_peerings.sh"
               arguments: >
-                ${{ parameters.resourceGroupName }}
+                $(rgName)
 
           # Task 3: Create Storage Accounts
           - task: AzureCLI@2
@@ -122,7 +129,7 @@ stages:
               arguments: >
                 ${{ parameters.subscriptionId }}
                 ${{ parameters.location }}
-                ${{ parameters.resourceGroupName }}
+                $(rgName)
 
           # Task 4: Create NSG
           - task: AzureCLI@2
@@ -134,7 +141,7 @@ stages:
               scriptPath: ".pipelines/swiftv2-long-running/scripts/create_nsg.sh"
               arguments: >
                 ${{ parameters.subscriptionId }}
-                ${{ parameters.resourceGroupName }}
+                $(rgName)
                 ${{ parameters.location }}
 
           # Task 5: Create Private Endpoint
@@ -148,7 +155,7 @@ stages:
               arguments: >
                 ${{ parameters.subscriptionId }}
                 ${{ parameters.location }}
-                ${{ parameters.resourceGroupName }}
+                $(rgName)
                 $(CreateStorageAccounts.StorageAccount1)
   # =================================================================
   # Stage 2: Datapath Tests
@@ -192,15 +199,15 @@ stages:
                 
                 echo "==> Setting up kubeconfig for cluster aks-1"
                 az aks get-credentials \
-                  --resource-group ${{ parameters.resourceGroupName }} \
+                  --resource-group $(rgName) \
                   --name aks-1 \
                   --file /tmp/aks-1.kubeconfig \
                   --overwrite-existing \
                   --admin
                 
                 echo "==> Setting up kubeconfig for cluster aks-2"
                 az aks get-credentials \
-                  --resource-group ${{ parameters.resourceGroupName }} \
+                  --resource-group $(rgName) \
                   --name aks-2 \
                   --file /tmp/aks-2.kubeconfig \
                   --overwrite-existing \
@@ -213,8 +220,8 @@ stages:
                 kubectl --kubeconfig /tmp/aks-2.kubeconfig get nodes
                 
                 echo "==> Creating test resources (8 scenarios)"
-                export RG=${{ parameters.resourceGroupName }}
-                export BUILD_ID=${{ parameters.resourceGroupName }}
+                export RG=$(rgName)
+                export BUILD_ID=$(rgName)
                 ginkgo -v -trace --timeout=1h ./test/integration/swiftv2/longRunningCluster --focus="Datapath Create"
 
           - script: |
@@ -258,22 +265,22 @@ stages:
                 
                 echo "==> Setting up kubeconfig for cluster aks-1"
                 az aks get-credentials \
-                  --resource-group ${{ parameters.resourceGroupName }} \
+                  --resource-group $(rgName) \
                   --name aks-1 \
                   --file /tmp/aks-1.kubeconfig \
                   --overwrite-existing \
                   --admin
                 
                 echo "==> Setting up kubeconfig for cluster aks-2"
                 az aks get-credentials \
-                  --resource-group ${{ parameters.resourceGroupName }} \
+                  --resource-group $(rgName) \
                   --name aks-2 \
                   --file /tmp/aks-2.kubeconfig \
                   --overwrite-existing \
                   --admin
                 
                 echo "==> Deleting test resources (8 scenarios)"
-                export RG=${{ parameters.resourceGroupName }}
-                export BUILD_ID=${{ parameters.resourceGroupName }}
+                export RG=$(rgName)
+                export BUILD_ID=$(rgName)
                 ginkgo -v -trace --timeout=1h ./test/integration/swiftv2/longRunningCluster --focus="Datapath Delete"