diff --git a/Tasks/AzureCloudPowerShellDeploymentV1/Publish-AzureCloudDeployment.ps1 b/Tasks/AzureCloudPowerShellDeploymentV1/Publish-AzureCloudDeployment.ps1 index 0eeb7831db59..cf863a9a04ef 100644 --- a/Tasks/AzureCloudPowerShellDeploymentV1/Publish-AzureCloudDeployment.ps1 +++ b/Tasks/AzureCloudPowerShellDeploymentV1/Publish-AzureCloudDeployment.ps1 @@ -102,13 +102,13 @@ try{ #Use -Upgrade -Mode Simultaneous -Force if ($label) { -  Write-Host "##[command]Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -Label $label -ExtensionConfiguration -Force" -  $azureDeployment = Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -Label $label -ExtensionConfiguration $diagnosticExtensions -Force + Write-Host "##[command]Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -Label $label -ExtensionConfiguration -Force" + $azureDeployment = Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -Label $label -ExtensionConfiguration $diagnosticExtensions -Force } else { -  Write-Host "##[command]Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -ExtensionConfiguration -Force" -  $azureDeployment = Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -ExtensionConfiguration $diagnosticExtensions -Force + Write-Host "##[command]Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -ExtensionConfiguration -Force" + $azureDeployment = Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -ExtensionConfiguration $diagnosticExtensions -Force } } elseif ($AllowUpgrade -eq $true -and $SimultaneousUpgrade -eq $true) @@ -116,12 +116,12 @@ try{ #Use -Upgrade -Mode Simultaneous if ($label) { -  Write-Host "##[command]Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -Label $label -ExtensionConfiguration " -  $azureDeployment = Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -Label $label -ExtensionConfiguration $diagnosticExtensions + Write-Host "##[command]Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -Label $label -ExtensionConfiguration " + $azureDeployment = Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -Label $label -ExtensionConfiguration $diagnosticExtensions } else { -  Write-Host "##[command]Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -ExtensionConfiguration " + Write-Host "##[command]Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -ExtensionConfiguration " $azureDeployment = Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -ExtensionConfiguration $diagnosticExtensions } } @@ -173,7 +173,6 @@ try{ } finally { Write-Verbose "Validate-ServiceStatus -ServiceName $ServiceName -Slot $Slot" - Validate-ServiceStatus -ServiceName $ServiceName -Slot $Slot Trace-VstsLeavingInvocation $MyInvocation } diff --git a/Tasks/AzureCloudPowerShellDeploymentV1/Strings/resources.resjson/en-US/resources.resjson b/Tasks/AzureCloudPowerShellDeploymentV1/Strings/resources.resjson/en-US/resources.resjson index 42ce618a7411..6d19957910bb 100644 --- a/Tasks/AzureCloudPowerShellDeploymentV1/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/AzureCloudPowerShellDeploymentV1/Strings/resources.resjson/en-US/resources.resjson @@ -36,23 +36,23 @@ "loc.input.help.NewServiceAdditionalArguments": "Pass in additional arguments while creating a brand new service. These will be passed on to `New-AzureService` cmdlet. Eg: `-Label 'MyTestService'`", "loc.input.label.NewServiceAffinityGroup": "Affinity group", "loc.input.help.NewServiceAffinityGroup": "While creating new service, this affinity group will be considered instead of using service location.", - "loc.messages._0couldnotbeparsedintopartsforregisteringdiagnosticsextensions": "'{0}' could not be parsed into parts for registering diagnostics extensions.", - "loc.messages.Addinganyconfiguredcustomcertificates": "Adding any configured custom certificates.", - "loc.messages.AllInstancesReadyRole0status": "All instances are in ReadyRole state now, and instances count is '{0}' ", - "loc.messages.Applyinganyconfigureddiagnosticsextensions": "Applying any configured diagnostics extensions.", "loc.messages.Couldnotgettheprimarystoragekeyforstorageaccount0Unabletoapplyanydiagnosticsextensions": "Could not get the primary storage key for storage account '{0}'. Unable to apply any diagnostics extensions.", "loc.messages.Couldnotgettheprimarystoragekeyforthepublicconfigstorageaccount0Unabletoapplyanydiagnosticsextensions": "Could not get the primary storage key for the public config storage account '{0}'. Unable to apply any diagnostics extensions.", + "loc.messages.Applyinganyconfigureddiagnosticsextensions": "Applying any configured diagnostics extensions.", + "loc.messages._0couldnotbeparsedintopartsforregisteringdiagnosticsextensions": "'{0}' could not be parsed into parts for registering diagnostics extensions.", + "loc.messages.Nofileswerefoundtodeploywithsearchpattern0": "No files were found to deploy with search pattern {0}", + "loc.messages.Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone": "Found more than one file to deploy with search pattern {0}. There can be only one.", + "loc.messages.Storagekeysaredefinedininvalidformat": "Storage keys are defined in invalid format.", + "loc.messages.Unabletofind0usingprovidedsubscription": "Unable to find {0} using provided subscription", "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "Current version of azure powershell does not support external storage account for configuring diagnostics.", "loc.messages.Customcertificatesaredefinedininvalidformat": "Custom certificates are defined in invalid format.", + "loc.messages.Addinganyconfiguredcustomcertificates": "Adding any configured custom certificates.", + "loc.messages.AllInstancesReadyRole0status": "All instances are in ReadyRole state now, and instances count is '{0}' ", "loc.messages.EachInstancesNameAndStatus0": "Status is 'ReadyRole' for the Instance name '{0}'", - "loc.messages.Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone": "Found more than one file to deploy with search pattern {0}. There can be only one.", "loc.messages.Instance0Name": "Service instance name {0} to find status", - "loc.messages.Nofileswerefoundtodeploywithsearchpattern0": "No files were found to deploy with search pattern '{0}'", - "loc.messages.RetryForService0Availablity": "Retried for service availablity for 4 times, 30 secs each, after 4 retries still srevice not avilable, check teh srevice dpeloyment again", + "loc.messages.RetryForService0Availablity": "Retried for service availability for 4 times, 30 secs each, after 4 retries still service not available, check teh service deployment again", "loc.messages.Role0OrRoleInstanceNotfound": "Either Role or Role Instance not found for a service '{0}'", "loc.messages.ServiceNotFound0": "Either Service not found or Test AzureName returned nothing for service '{0}'", - "loc.messages.Storagekeysaredefinedininvalidformat": "Storage keys are defined in invalid format.", - "loc.messages.Unabletofind0usingprovidedsubscription": "Unable to find {0} using provided subscription", "loc.messages.Unabletofindservicestatus0": "Status is not 'ReadyRole' for instance name '{0}'", "loc.messages.WaitingForInstance0Beforefindstatus": "Service not yet ready sleeping for 120 seconds ...Waiting for roles of '{0}' to come on-line..", "loc.messages.WaitingForService0Available": "Service not yet ready sleeping for 210 seconds ... retry the task again" diff --git a/Tasks/AzureCloudPowerShellDeploymentV1/task.json b/Tasks/AzureCloudPowerShellDeploymentV1/task.json index bf1f382318b6..0f9b5ef11b83 100644 --- a/Tasks/AzureCloudPowerShellDeploymentV1/task.json +++ b/Tasks/AzureCloudPowerShellDeploymentV1/task.json @@ -16,7 +16,7 @@ "version": { "Major": 1, "Minor": 3, - "Patch": 4 + "Patch": 5 }, "demands": [ "azureps" diff --git a/Tasks/AzureCloudPowerShellDeploymentV1/task.loc.json b/Tasks/AzureCloudPowerShellDeploymentV1/task.loc.json index 4512755d0d4f..18caf27ec088 100644 --- a/Tasks/AzureCloudPowerShellDeploymentV1/task.loc.json +++ b/Tasks/AzureCloudPowerShellDeploymentV1/task.loc.json @@ -16,7 +16,7 @@ "version": { "Major": 1, "Minor": 3, - "Patch": 4 + "Patch": 5 }, "demands": [ "azureps" @@ -222,23 +222,23 @@ } }, "messages": { - "_0couldnotbeparsedintopartsforregisteringdiagnosticsextensions": "ms-resource:loc.messages._0couldnotbeparsedintopartsforregisteringdiagnosticsextensions", - "Addinganyconfiguredcustomcertificates": "ms-resource:loc.messages.Addinganyconfiguredcustomcertificates", - "AllInstancesReadyRole0status": "ms-resource:loc.messages.AllInstancesReadyRole0status", - "Applyinganyconfigureddiagnosticsextensions": "ms-resource:loc.messages.Applyinganyconfigureddiagnosticsextensions", "Couldnotgettheprimarystoragekeyforstorageaccount0Unabletoapplyanydiagnosticsextensions": "ms-resource:loc.messages.Couldnotgettheprimarystoragekeyforstorageaccount0Unabletoapplyanydiagnosticsextensions", "Couldnotgettheprimarystoragekeyforthepublicconfigstorageaccount0Unabletoapplyanydiagnosticsextensions": "ms-resource:loc.messages.Couldnotgettheprimarystoragekeyforthepublicconfigstorageaccount0Unabletoapplyanydiagnosticsextensions", + "Applyinganyconfigureddiagnosticsextensions": "ms-resource:loc.messages.Applyinganyconfigureddiagnosticsextensions", + "_0couldnotbeparsedintopartsforregisteringdiagnosticsextensions": "ms-resource:loc.messages._0couldnotbeparsedintopartsforregisteringdiagnosticsextensions", + "Nofileswerefoundtodeploywithsearchpattern0": "ms-resource:loc.messages.Nofileswerefoundtodeploywithsearchpattern0", + "Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone": "ms-resource:loc.messages.Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone", + "Storagekeysaredefinedininvalidformat": "ms-resource:loc.messages.Storagekeysaredefinedininvalidformat", + "Unabletofind0usingprovidedsubscription": "ms-resource:loc.messages.Unabletofind0usingprovidedsubscription", "Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "ms-resource:loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics", "Customcertificatesaredefinedininvalidformat": "ms-resource:loc.messages.Customcertificatesaredefinedininvalidformat", + "Addinganyconfiguredcustomcertificates": "ms-resource:loc.messages.Addinganyconfiguredcustomcertificates", + "AllInstancesReadyRole0status": "ms-resource:loc.messages.AllInstancesReadyRole0status", "EachInstancesNameAndStatus0": "ms-resource:loc.messages.EachInstancesNameAndStatus0", - "Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone": "ms-resource:loc.messages.Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone", "Instance0Name": "ms-resource:loc.messages.Instance0Name", - "Nofileswerefoundtodeploywithsearchpattern0": "ms-resource:loc.messages.Nofileswerefoundtodeploywithsearchpattern0", "RetryForService0Availablity": "ms-resource:loc.messages.RetryForService0Availablity", "Role0OrRoleInstanceNotfound": "ms-resource:loc.messages.Role0OrRoleInstanceNotfound", "ServiceNotFound0": "ms-resource:loc.messages.ServiceNotFound0", - "Storagekeysaredefinedininvalidformat": "ms-resource:loc.messages.Storagekeysaredefinedininvalidformat", - "Unabletofind0usingprovidedsubscription": "ms-resource:loc.messages.Unabletofind0usingprovidedsubscription", "Unabletofindservicestatus0": "ms-resource:loc.messages.Unabletofindservicestatus0", "WaitingForInstance0Beforefindstatus": "ms-resource:loc.messages.WaitingForInstance0Beforefindstatus", "WaitingForService0Available": "ms-resource:loc.messages.WaitingForService0Available"