updates (#39)

PieterbasNagengast · May 10, 2023 · 2aa7d00 · 2aa7d00
1 parent a4d9518
commit 2aa7d00
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 3 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -68,7 +68,14 @@ jobs:
           subscriptionId: ${{ secrets.HUB_SUBSCRIPTION_ID }}
           region: westus3
           template: main.bicep
-          parameters: "ARM/params/${{ matrix.scenarios }} adminUsername=${{ secrets.ADMINUSERNAME }} adminPassword=${{ secrets.ADMINPASSWORD }} sharedKey=${{ secrets.SHAREDKEY }} hubSubscriptionID=${{ secrets.HUB_SUBSCRIPTION_ID }} spokeSubscriptionID=${{ secrets.SPOKE_SUBSCRIPTION_ID }} onPremSubscriptionID=${{ secrets.ONPREM_SUBSCRIPTION_ID }}"
+          parameters: 
+            ARM/params/${{ matrix.scenarios }}
+            adminUsername=${{ secrets.ADMINUSERNAME }}
+            adminPassword=${{ secrets.ADMINPASSWORD }}
+            sharedKey=${{ secrets.SHAREDKEY }}
+            hubSubscriptionID=${{ secrets.HUB_SUBSCRIPTION_ID }}
+            spokeSubscriptionID=${{ secrets.SPOKE_SUBSCRIPTION_ID }}
+            onPremSubscriptionID=${{ secrets.ONPREM_SUBSCRIPTION_ID }}
           deploymentMode: "validate"
           deploymentName: "LabBuilderValidation-${{ inputs.LabBuilderType }}"
       - name: "Deploy scenario ${{ inputs.LabBuilderType }}"
@@ -78,7 +85,14 @@ jobs:
           subscriptionId: ${{ secrets.HUB_SUBSCRIPTION_ID }}
           region: westus3
           template: main.bicep
-          parameters: "ARM/params/${{ matrix.scenarios }} adminUsername=${{ secrets.ADMINUSERNAME }} adminPassword=${{ secrets.ADMINPASSWORD }} sharedKey=${{ secrets.SHAREDKEY }} hubSubscriptionID=${{ secrets.HUB_SUBSCRIPTION_ID }} spokeSubscriptionID=${{ secrets.SPOKE_SUBSCRIPTION_ID }} onPremSubscriptionID=${{ secrets.ONPREM_SUBSCRIPTION_ID }}"
+          parameters: 
+            ARM/params/${{ matrix.scenarios }}
+            adminUsername=${{ secrets.ADMINUSERNAME }}
+            adminPassword=${{ secrets.ADMINPASSWORD }}
+            sharedKey=${{ secrets.SHAREDKEY }}
+            hubSubscriptionID=${{ secrets.HUB_SUBSCRIPTION_ID }}
+            spokeSubscriptionID=${{ secrets.SPOKE_SUBSCRIPTION_ID }}
+            onPremSubscriptionID=${{ secrets.ONPREM_SUBSCRIPTION_ID }}
           deploymentName: "LabBuilderValidation-${{ inputs.LabBuilderType }}"
 
 

diff --git a/.github/workflows/vnet.yml b/.github/workflows/vnet.yml
@@ -11,7 +11,7 @@ jobs:
     call_deploy_workflow:
         uses: ./.github/workflows/deploy.yml
         with:
-            LabBuilderType: VNET
+            LabBuilderType: vnet
             LabBuilderCleanup: true
         secrets:
             inherit
diff --git a/.github/workflows/vwan.yml b/.github/workflows/vwan.yml
@@ -0,0 +1,17 @@
+name: "LabBuilder - Deploy VWAN Scenarios"
+
+on:
+  push:
+    branches: none
+  pull_request:
+    branches: none
+  workflow_dispatch:
+
+jobs:
+    call_deploy_workflow:
+        uses: ./.github/workflows/deploy.yml
+        with:
+            LabBuilderType: vwan
+            LabBuilderCleanup: true
+        secrets:
+            inherit