Update

UiPath · Mar 29, 2021 · f65ba41 · f65ba41
1 parent 0498d34
commit f65ba41
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 24 deletions.
diff --git a/Azure/Orchestrator/20.10.7/AzureUtils.psm1 → Azure/Orchestrator/20.10.8/AzureUtils.psm1 b/Azure/Orchestrator/20.10.7/AzureUtils.psm1 → Azure/Orchestrator/20.10.8/AzureUtils.psm1
diff --git a/...20.10.7/CleanUpOrchestrationResources.ps1 → ...20.10.8/CleanUpOrchestrationResources.ps1 b/...20.10.7/CleanUpOrchestrationResources.ps1 → ...20.10.8/CleanUpOrchestrationResources.ps1
@@ -33,6 +33,14 @@ Import-Module ([System.IO.Path]::GetFullPath((Join-Path (Get-Location) "./AzureU
 Write-Output " ******* $(Get-Date) Orchestrator installation cleanup started *******"
 
 $vm = Get-AzVm -Name $VMName
+
+$count = 1
+while (!$vm.StorageProfile.OSDisk.Name -and ($count -lt 30)) {
+    Start-Sleep -Seconds 3
+    Write-Host "The value of the disk name is: $($vm.StorageProfile.OSDisk.Name)"
+    $count++
+}
+
 $OSDiskName = $vm.StorageProfile.OSDisk.Name
 
 Remove-AzVM -Name $VMName -ResourceGroupName $RGName -Force
@@ -45,4 +53,4 @@ Remove-AzDisk -ResourceGroupName $RGName -DiskName $OSDiskName -Force
 Write-Output " ******* $(Get-Date) Orchestrator installation cleanup finished *******"
 Stop-Transcript
 
-Send-LogFileToInsights -insightsKey $insightsKey -logFile $logFile
+Send-LogFileToInsights -insightsKey $insightsKey -logFile $logFile
diff --git a/...20.10.7/Deploy-UiPathOrchestratorPaaS.ps1 → ...20.10.8/Deploy-UiPathOrchestratorPaaS.ps1 b/...20.10.7/Deploy-UiPathOrchestratorPaaS.ps1 → ...20.10.8/Deploy-UiPathOrchestratorPaaS.ps1
diff --git a/...ator/20.10.7/MigrateTo-IdentityServer.ps1 → ...ator/20.10.8/MigrateTo-IdentityServer.ps1 b/...ator/20.10.7/MigrateTo-IdentityServer.ps1 → ...ator/20.10.8/MigrateTo-IdentityServer.ps1
diff --git a/...chestrator/20.10.7/MigrateTo-Webhooks.ps1 → ...chestrator/20.10.8/MigrateTo-Webhooks.ps1 b/...chestrator/20.10.7/MigrateTo-Webhooks.ps1 → ...chestrator/20.10.8/MigrateTo-Webhooks.ps1
diff --git a/...trator/20.10.7/Publish-IdentityServer.ps1 → ...trator/20.10.8/Publish-IdentityServer.ps1 b/...trator/20.10.7/Publish-IdentityServer.ps1 → ...trator/20.10.8/Publish-IdentityServer.ps1
diff --git a/...estrator/20.10.7/Publish-Orchestrator.ps1 → ...estrator/20.10.8/Publish-Orchestrator.ps1 b/...estrator/20.10.7/Publish-Orchestrator.ps1 → ...estrator/20.10.8/Publish-Orchestrator.ps1
diff --git a/...Orchestrator/20.10.7/Publish-Webhooks.ps1 → ...Orchestrator/20.10.8/Publish-Webhooks.ps1 b/...Orchestrator/20.10.7/Publish-Webhooks.ps1 → ...Orchestrator/20.10.8/Publish-Webhooks.ps1
diff --git a/Azure/Orchestrator/20.10.7/ps_utils.zip → Azure/Orchestrator/20.10.8/ps_utils.zip b/Azure/Orchestrator/20.10.7/ps_utils.zip → Azure/Orchestrator/20.10.8/ps_utils.zip
diff --git a/Azure/Orchestrator/createUiDefinition.json b/Azure/Orchestrator/createUiDefinition.json
@@ -456,12 +456,12 @@
 						"name": "orchestratorVersion",
 						"label": "Orchestrator version",
 						"type": "Microsoft.Common.DropDown",
-						"defaultValue": "20.10.7",
+						"defaultValue": "20.10.8",
 						"constraints": {
 							"allowedValues": [
 								{
-									"label": "20.10.7",
-									"value": "20.10.7"
+									"label": "20.10.8",
+									"value": "20.10.8"
 								}
 							]
 						},
@@ -922,4 +922,4 @@
 			"HAAVMNamePrefix": "[if(equals(steps('AdvancedConfig').AdvConfVisibility, 'Yes'),steps('AdvancedConfig').AdvancedConfigurationDetails.HAAVMNamePrefix,concat(steps('AdvancedConfig').orchestratorName,'-haa-vm'))]"
 		}
 	}
-}
+}
diff --git a/Azure/Orchestrator/linkedTemplates/PaaSWithIdentity.json b/Azure/Orchestrator/linkedTemplates/PaaSWithIdentity.json
@@ -92,9 +92,9 @@
         },
         "orchestratorVersion": {
             "type": "string",
-            "defaultValue": "20.10.7",
+            "defaultValue": "20.10.8",
             "allowedValues": [
-                "20.10.7"
+                "20.10.8"
             ],
             "metadata": {
                 "description": "Version of the Orchestrator"

diff --git a/Azure/Orchestrator/mainTemplate.json b/Azure/Orchestrator/mainTemplate.json
@@ -90,9 +90,9 @@
         },
         "orchestratorVersion": {
             "type": "string",
-            "defaultValue": "20.10.7",
+            "defaultValue": "20.10.8",
             "allowedValues": [
-                "20.10.7"
+                "20.10.8"
             ],
             "metadata": {
                 "description": "Version of the Orchestrator"
@@ -430,21 +430,6 @@
         }
     },
     "resources": [
-        {
-            "apiVersion": "2019-10-01",
-            "name": "pid-5b5efb37-e388-4862-add1-0be0d6d0d45b",
-            "tags": "[ if(contains(parameters('tagsByResource'), 'Microsoft.Resources/deployments'), parameters('tagsByResource')['Microsoft.Resources/deployments'], json('{}')) ]",
-            "type": "Microsoft.Resources/deployments",
-            "properties": {
-                "mode": "Incremental",
-                "template": {
-                    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-                    "contentVersion": "1.0.0.0",
-                    "resources": [
-                    ]
-                }
-            }
-        },
         {
             "name": "SQLTemplate",
             "type": "Microsoft.Resources/deployments",