uncommented tasks

ARPA-H · Oct 31, 2024 · 90986a1 · 90986a1
1 parent af5dffb
commit 90986a1
Showing 1 changed file with 23 additions and 34 deletions.
diff --git a/.github/workflows/Deploy-Env.yml b/.github/workflows/Deploy-Env.yml
@@ -24,47 +24,36 @@ jobs:
         creds: ${{ secrets.AZURE_CREDENTIALS }} 
         enable-AzPSSession: true
 
-    # - name: Deploy Bicep file to ${{ github.event.inputs.environment }} environment
-    #   uses: azure/arm-deploy@v2
-    #   with:
-    #     scope: subscription
-    #     subscriptionId: ${{ secrets.AZURE_SUB_ID }}
-    #     region: eastus
-    #     deploymentMode: 'Validate'
-    #     template: ./workload/bicep/deploy-baseline-arpah.bicep
-    #     parameters: ./workload/bicep/parameters/deploy-baseline-parameters-arpah.json deploymentEnvironment=${{ github.event.inputs.environment }} avdWorkloadSubsId=${{ secrets.AZURE_SUB_ID }} avdVmLocalUserName=${{ secrets.AVD_ADMIN }} avdVmLocalUserPassword=${{ secrets.AVD_ADMINPASS }} avdEnterpriseAppObjectId=${{ secrets.AZURE_AVD_OBJECTID }} existingVnetAvdSubnetResourceId=${{ secrets.AVD_SUBNET_ID }} existingVnetPrivateEndpointSubnetResourceId=${{ secrets.AVD_SUBNET_ID }} identityDomainName=${{ secrets.AD_NAME}} avdDomainJoinUserName=${{ secrets.AD_JOIN_USER }} avdDomainJoinUserPassword=${{ secrets.AD_JOIN_PASS }} avdOuPath="${{ secrets.AD_OU }}" storageOuPath="${{ secrets.AD_OU }}" storageFilePrivateEndpointStaticIp="${{ secrets.STORAGEFILEPRIVATEENDPOINTSTATICIP }}" storageFilePrivateEndpointStaticIpRemote="${{ secrets.STORAGEFILEPRIVATEENDPOINTSTATICIPREMOTE }}"
-    #     failOnStdErr: true
-
     - name: Deploy Bicep file to ${{ github.event.inputs.environment }} environment
       uses: azure/arm-deploy@v2
       with:
         scope: subscription
         subscriptionId: ${{ secrets.AZURE_SUB_ID }}
         region: eastus
         deploymentMode: 'Validate'
-        template: ./workload/bicep/deploy-test.bicep
-        parameters: avdWorkloadSubsId=${{ secrets.AZURE_SUB_ID }} avdEnterpriseAppObjectId=${{ secrets.AZURE_AVD_OBJECTID }}
+        template: ./workload/bicep/deploy-baseline-arpah.bicep
+        parameters: ./workload/bicep/parameters/deploy-baseline-parameters-arpah.json deploymentEnvironment=${{ github.event.inputs.environment }} avdWorkloadSubsId=${{ secrets.AZURE_SUB_ID }} avdVmLocalUserName=${{ secrets.AVD_ADMIN }} avdVmLocalUserPassword=${{ secrets.AVD_ADMINPASS }} avdEnterpriseAppObjectId=${{ secrets.AZURE_AVD_OBJECTID }} existingVnetAvdSubnetResourceId=${{ secrets.AVD_SUBNET_ID }} existingVnetPrivateEndpointSubnetResourceId=${{ secrets.AVD_SUBNET_ID }} identityDomainName=${{ secrets.AD_NAME}} avdDomainJoinUserName=${{ secrets.AD_JOIN_USER }} avdDomainJoinUserPassword=${{ secrets.AD_JOIN_PASS }} avdOuPath="${{ secrets.AD_OU }}" storageOuPath="${{ secrets.AD_OU }}" storageFilePrivateEndpointStaticIp="${{ secrets.STORAGEFILEPRIVATEENDPOINTSTATICIP }}" storageFilePrivateEndpointStaticIpRemote="${{ secrets.STORAGEFILEPRIVATEENDPOINTSTATICIPREMOTE }}"
         failOnStdErr: true
 
-    # - name: Update networking in ${{ github.event.inputs.environment }} environment
-    #   uses: azure/arm-deploy@v2
-    #   with:
-    #     scope: subscription
-    #     subscriptionId: ${{ secrets.AZURE_SUB_ID }}
-    #     region: eastus2
-    #     deploymentMode: 'Validate'
-    #     template: ./workload/bicep/update-networking-arpah.bicep
-    #     parameters: ./workload/bicep/parameters/update-networking-parameters-arpah.json deploymentEnvironment=${{ github.event.inputs.environment }} avdWorkloadSubsId=${{ secrets.AZURE_SUB_ID }} existingVnetAvdSubnetResourceId=${{ secrets.AVD_SUBNET_ID }}"
-    #     failOnStdErr: true
+    - name: Update networking in ${{ github.event.inputs.environment }} environment
+      uses: azure/arm-deploy@v2
+      with:
+        scope: subscription
+        subscriptionId: ${{ secrets.AZURE_SUB_ID }}
+        region: eastus2
+        deploymentMode: 'Validate'
+        template: ./workload/bicep/update-networking-arpah.bicep
+        parameters: ./workload/bicep/parameters/update-networking-parameters-arpah.json deploymentEnvironment=${{ github.event.inputs.environment }} avdWorkloadSubsId=${{ secrets.AZURE_SUB_ID }} existingVnetAvdSubnetResourceId=${{ secrets.AVD_SUBNET_ID }}"
+        failOnStdErr: true
 
-    # - name: Update AVD Application Group Display Name in the ${{ github.event.inputs.environment }} environment
-    #   uses: azure/powershell@v2
-    #   env:
-    #     ResourceGroupName: 'avd-nih-arpah-${{ github.event.inputs.environment }}-use2-service-objects'
-    #     ApplicationGroupName: 'vdag-desktop-app1-${{ github.event.inputs.environment }}-use2-001'
-    #     Name: 'SessionDesktop'
-    #     FriendlyName: 'ARPA-H Windows Desktop'
-    #   with:
-    #     inlineScript: ./.github/workflows/scripts/update_app_display_name.ps1 -ResourceGroupName ${{ env.ResourceGroupName }} -ApplicationGroupName  ${{ env.ApplicationGroupName }} -Name  ${{ env.Name }} -FriendlyName  '${{ env.FriendlyName }}'
-    #     azPSVersion: "latest"
-    #     errorActionPreference: continue
+    - name: Update AVD Application Group Display Name in the ${{ github.event.inputs.environment }} environment
+      uses: azure/powershell@v2
+      env:
+        ResourceGroupName: 'avd-nih-arpah-${{ github.event.inputs.environment }}-use2-service-objects'
+        ApplicationGroupName: 'vdag-desktop-app1-${{ github.event.inputs.environment }}-use2-001'
+        Name: 'SessionDesktop'
+        FriendlyName: 'ARPA-H Windows Desktop'
+      with:
+        inlineScript: ./.github/workflows/scripts/update_app_display_name.ps1 -ResourceGroupName ${{ env.ResourceGroupName }} -ApplicationGroupName  ${{ env.ApplicationGroupName }} -Name  ${{ env.Name }} -FriendlyName  '${{ env.FriendlyName }}'
+        azPSVersion: "latest"
+        errorActionPreference: continue