Skip to content

Commit

Permalink
Users/ajya/ac service external contribution removed (#7284)
Browse files Browse the repository at this point in the history 
* revert external contribution changes

* external contribution removed
  • Loading branch information
Ajay Kumar Yadav authored May 24, 2018
1 parent 1157d25 commit 925fea5
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 27 deletions.
15 changes: 7 additions & 8 deletions Tasks/AzureCloudPowerShellDeploymentV1/Publish-AzureCloudDeployment.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,26 +102,26 @@ 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 <extensions> -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 <extensions> -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 <extensions> -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 <extensions> -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)
{
#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 <extensions>"
  $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 <extensions>"
$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 <extensions>"
Write-Host "##[command]Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -ExtensionConfiguration <extensions>"
$azureDeployment = Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -ExtensionConfiguration $diagnosticExtensions
}
}
Expand Down Expand Up @@ -173,7 +173,6 @@ try{

} finally {
Write-Verbose "Validate-ServiceStatus -ServiceName $ServiceName -Slot $Slot"
Validate-ServiceStatus -ServiceName $ServiceName -Slot $Slot
Trace-VstsLeavingInvocation $MyInvocation
}

18 changes: 9 additions & 9 deletions Tasks/AzureCloudPowerShellDeploymentV1/Strings/resources.resjson/en-US/resources.resjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureCloudPowerShellDeploymentV1/task.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"version": {
"Major": 1,
"Minor": 3,
"Patch": 4
"Patch": 5
},
"demands": [
"azureps"
Expand Down
18 changes: 9 additions & 9 deletions Tasks/AzureCloudPowerShellDeploymentV1/task.loc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"version": {
"Major": 1,
"Minor": 3,
"Patch": 4
"Patch": 5
},
"demands": [
"azureps"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 925fea5

Please sign in to comment.