From f65ba416fc9163e0229bfc284a72ffb421767a88 Mon Sep 17 00:00:00 2001 From: ReposUpdateBot Date: Mon, 29 Mar 2021 08:40:12 +0000 Subject: [PATCH] Update --- .../{20.10.7 => 20.10.8}/AzureUtils.psm1 | 0 .../CleanUpOrchestrationResources.ps1 | 10 ++++++++- .../Deploy-UiPathOrchestratorPaaS.ps1 | 0 .../MigrateTo-IdentityServer.ps1 | 0 .../MigrateTo-Webhooks.ps1 | 0 .../Publish-IdentityServer.ps1 | 0 .../Publish-Orchestrator.ps1 | 0 .../{20.10.7 => 20.10.8}/Publish-Webhooks.ps1 | 0 .../{20.10.7 => 20.10.8}/ps_utils.zip | Bin Azure/Orchestrator/createUiDefinition.json | 8 ++++---- .../linkedTemplates/PaaSWithIdentity.json | 4 ++-- Azure/Orchestrator/mainTemplate.json | 19 ++---------------- 12 files changed, 17 insertions(+), 24 deletions(-) rename Azure/Orchestrator/{20.10.7 => 20.10.8}/AzureUtils.psm1 (100%) rename Azure/Orchestrator/{20.10.7 => 20.10.8}/CleanUpOrchestrationResources.ps1 (85%) rename Azure/Orchestrator/{20.10.7 => 20.10.8}/Deploy-UiPathOrchestratorPaaS.ps1 (100%) rename Azure/Orchestrator/{20.10.7 => 20.10.8}/MigrateTo-IdentityServer.ps1 (100%) rename Azure/Orchestrator/{20.10.7 => 20.10.8}/MigrateTo-Webhooks.ps1 (100%) rename Azure/Orchestrator/{20.10.7 => 20.10.8}/Publish-IdentityServer.ps1 (100%) rename Azure/Orchestrator/{20.10.7 => 20.10.8}/Publish-Orchestrator.ps1 (100%) rename Azure/Orchestrator/{20.10.7 => 20.10.8}/Publish-Webhooks.ps1 (100%) rename Azure/Orchestrator/{20.10.7 => 20.10.8}/ps_utils.zip (100%) diff --git a/Azure/Orchestrator/20.10.7/AzureUtils.psm1 b/Azure/Orchestrator/20.10.8/AzureUtils.psm1 similarity index 100% rename from Azure/Orchestrator/20.10.7/AzureUtils.psm1 rename to Azure/Orchestrator/20.10.8/AzureUtils.psm1 diff --git a/Azure/Orchestrator/20.10.7/CleanUpOrchestrationResources.ps1 b/Azure/Orchestrator/20.10.8/CleanUpOrchestrationResources.ps1 similarity index 85% rename from Azure/Orchestrator/20.10.7/CleanUpOrchestrationResources.ps1 rename to Azure/Orchestrator/20.10.8/CleanUpOrchestrationResources.ps1 index 9d75cf2..2721706 100644 --- a/Azure/Orchestrator/20.10.7/CleanUpOrchestrationResources.ps1 +++ b/Azure/Orchestrator/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 \ No newline at end of file +Send-LogFileToInsights -insightsKey $insightsKey -logFile $logFile diff --git a/Azure/Orchestrator/20.10.7/Deploy-UiPathOrchestratorPaaS.ps1 b/Azure/Orchestrator/20.10.8/Deploy-UiPathOrchestratorPaaS.ps1 similarity index 100% rename from Azure/Orchestrator/20.10.7/Deploy-UiPathOrchestratorPaaS.ps1 rename to Azure/Orchestrator/20.10.8/Deploy-UiPathOrchestratorPaaS.ps1 diff --git a/Azure/Orchestrator/20.10.7/MigrateTo-IdentityServer.ps1 b/Azure/Orchestrator/20.10.8/MigrateTo-IdentityServer.ps1 similarity index 100% rename from Azure/Orchestrator/20.10.7/MigrateTo-IdentityServer.ps1 rename to Azure/Orchestrator/20.10.8/MigrateTo-IdentityServer.ps1 diff --git a/Azure/Orchestrator/20.10.7/MigrateTo-Webhooks.ps1 b/Azure/Orchestrator/20.10.8/MigrateTo-Webhooks.ps1 similarity index 100% rename from Azure/Orchestrator/20.10.7/MigrateTo-Webhooks.ps1 rename to Azure/Orchestrator/20.10.8/MigrateTo-Webhooks.ps1 diff --git a/Azure/Orchestrator/20.10.7/Publish-IdentityServer.ps1 b/Azure/Orchestrator/20.10.8/Publish-IdentityServer.ps1 similarity index 100% rename from Azure/Orchestrator/20.10.7/Publish-IdentityServer.ps1 rename to Azure/Orchestrator/20.10.8/Publish-IdentityServer.ps1 diff --git a/Azure/Orchestrator/20.10.7/Publish-Orchestrator.ps1 b/Azure/Orchestrator/20.10.8/Publish-Orchestrator.ps1 similarity index 100% rename from Azure/Orchestrator/20.10.7/Publish-Orchestrator.ps1 rename to Azure/Orchestrator/20.10.8/Publish-Orchestrator.ps1 diff --git a/Azure/Orchestrator/20.10.7/Publish-Webhooks.ps1 b/Azure/Orchestrator/20.10.8/Publish-Webhooks.ps1 similarity index 100% rename from Azure/Orchestrator/20.10.7/Publish-Webhooks.ps1 rename to Azure/Orchestrator/20.10.8/Publish-Webhooks.ps1 diff --git a/Azure/Orchestrator/20.10.7/ps_utils.zip b/Azure/Orchestrator/20.10.8/ps_utils.zip similarity index 100% rename from Azure/Orchestrator/20.10.7/ps_utils.zip rename to Azure/Orchestrator/20.10.8/ps_utils.zip diff --git a/Azure/Orchestrator/createUiDefinition.json b/Azure/Orchestrator/createUiDefinition.json index 43b1630..d30c534 100644 --- 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'))]" } } -} \ No newline at end of file +} diff --git a/Azure/Orchestrator/linkedTemplates/PaaSWithIdentity.json b/Azure/Orchestrator/linkedTemplates/PaaSWithIdentity.json index ff87211..be36473 100644 --- 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 index 21b65b2..dd068c4 100644 --- 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",