Supporting simultaneous update. (#6750)

* Update task.json Supporting simultaneous update. Specifies the Simultaneous Mode of update to initiate. All role instances will be updated at once. * Update task.loc.json Supporting simultaneous update. Specifies the Simultaneous Mode of update to initiate. All role instances will be updated at once. * Update resources.resjson Supporting simultaneous update. Specifies the Simultaneous Mode of update to initiate. All role instances will be updated at once. * Update resources.resjson Supporting simultaneous update. Specifies the Simultaneous Mode of update to initiate. All role instances will be updated at once. * Update resources.resjson Supporting simultaneous update. Specifies the Simultaneous Mode of update to initiate. All role instances will be updated at once. * Update resources.resjson Supporting simultaneous update. Specifies the Simultaneous Mode of update to initiate. All role instances will be updated at once. * Update resources.resjson Supporting simultaneous update. Specifies the Simultaneous Mode of update to initiate. All role instances will be updated at once. * Update resources.resjson Supporting simultaneous update. Specifies the Simultaneous Mode of update to initiate. All role instances will be updated at once. * Update resources.resjson Supporting simultaneous update. Specifies the Simultaneous Mode of update to initiate. All role instances will be updated at once. * Update resources.resjson Supporting simultaneous update. Specifies the Simultaneous Mode of update to initiate. All role instances will be updated at once. * Update resources.resjson Supporting simultaneous update. Specifies the Simultaneous Mode of update to initiate. All role instances will be updated at once. * Update resources.resjson Supporting simultaneous update. Specifies the Simultaneous Mode of update to initiate. All role instances will be updated at once. * Update Publish-AzureCloudDeployment.ps1 "loc.input.label.SimultaneousUpgrade": "Simultaneous upgrade", "loc.input.help.SimultaneousUpgrade": "Updates all instances at once. Your cloud service will be unavailable during update.", * Update task.json Increasing the Minor version from 2 to 3. * Update task.loc.json Increasing the Minor version from 2 to 3.
microsoft · Mar 26, 2018 · 42b95f2 · 42b95f2
1 parent c02fb6e
commit 42b95f2
Show file tree

Hide file tree

Showing 13 changed files with 82 additions and 14 deletions.
diff --git a/Tasks/AzureCloudPowerShellDeployment/Publish-AzureCloudDeployment.ps1 b/Tasks/AzureCloudPowerShellDeployment/Publish-AzureCloudDeployment.ps1
@@ -12,6 +12,7 @@ try{
     $DeploymentLabel = Get-VstsInput -Name DeploymentLabel
     $AppendDateTimeToLabel = Get-VstsInput -Name AppendDateTimeToLabel -Require
     $AllowUpgrade = Get-VstsInput -Name AllowUpgrade -Require -AsBool
+    $SimultaneousUpgrade = Get-VstsInput -Name SimultaneousUpgrade -AsBool
     $ForceUpgrade = Get-VstsInput -Name ForceUpgrade -AsBool
     $DiagnosticStorageAccountKeys = Get-VstsInput -Name DiagnosticStorageAccountKeys
     $NewServiceAdditionalArguments = Get-VstsInput -Name NewServiceAdditionalArguments
@@ -95,7 +96,35 @@ try{
             Write-Host "##[command]New-AzureDeployment -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -ExtensionConfiguration <extensions>"
             $azureDeployment = New-AzureDeployment -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -ExtensionConfiguration $diagnosticExtensions
         }
-    } 
+    }
+    elseif ($AllowUpgrade -eq $true -and $SimultaneousUpgrade -eq $true -and $ForceUpgrade -eq $true)
+    {
+        #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
+        }
+        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
+        }
+    }
+    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
+        }
+        else
+        {
+            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
+        }
+    }
     elseif ($AllowUpgrade -eq $true -and $ForceUpgrade -eq $true)
     {
         #Use -Upgrade

diff --git a/Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/de-de/resources.resjson b/Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/de-de/resources.resjson
@@ -24,6 +24,8 @@
   "loc.input.help.AppendDateTimeToLabel": "Fügt das aktuelle Datum und die aktuelle Uhrzeit an die Bereitstellungsbezeichnung an",
   "loc.input.label.AllowUpgrade": "Upgrade zulassen",
   "loc.input.help.AllowUpgrade": "Auswahl ermöglicht ein Upgrade auf die Microsoft Azure-Bereitstellung",
+  "loc.input.label.SimultaneousUpgrade": "Simultaneous upgrade",
+  "loc.input.help.SimultaneousUpgrade": "Updates all instances at once. Your cloud service will be unavailable during update.",
   "loc.input.label.ForceUpgrade": "Upgrade erzwingen",
   "loc.input.help.ForceUpgrade": "Auswahl legt ein erzwungenes Upgrade fest, das zum Verlust lokaler Daten führen kann.",
   "loc.input.label.DiagnosticStorageAccountKeys": "Schlüssel für Diagnosespeicherkonto",
@@ -45,4 +47,4 @@
   "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "Die aktuelle Version von Azure PowerShell bietet keine Unterstützung für ein externes Speicherkonto zum Konfigurieren der Diagnose.",
   "loc.messages.Addinganyconfiguredcustomcertificates": "Adding any configured custom certificates.",
   "loc.messages.Customcertificatesaredefinedininvalidformat": "Custom certificates are defined in invalid format."
-}
+}
diff --git a/Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/en-US/resources.resjson b/Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/en-US/resources.resjson
@@ -24,6 +24,8 @@
   "loc.input.help.AppendDateTimeToLabel": "Appends current date and time to deployment label",
   "loc.input.label.AllowUpgrade": "Allow upgrade",
   "loc.input.help.AllowUpgrade": "When selected allows an upgrade to the Microsoft Azure deployment",
+  "loc.input.label.SimultaneousUpgrade": "Simultaneous upgrade",
+  "loc.input.help.SimultaneousUpgrade": "Updates all instances at once. Your cloud service will be unavailable during update.",
   "loc.input.label.ForceUpgrade": "Force upgrade",
   "loc.input.help.ForceUpgrade": "When selected sets the upgrade to a forced upgrade, which could potentially cause loss of local data.",
   "loc.input.label.DiagnosticStorageAccountKeys": "Diagnostic storage account keys",
@@ -45,4 +47,4 @@
   "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."
-}
+}
diff --git a/Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/es-es/resources.resjson b/Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/es-es/resources.resjson
@@ -24,6 +24,8 @@
   "loc.input.help.AppendDateTimeToLabel": "Anexa la fecha y hora actuales a la etiqueta de implementación",
   "loc.input.label.AllowUpgrade": "Permitir actualización",
   "loc.input.help.AllowUpgrade": "Si selecciona esta opción, se permite la actualización a la implementación en Microsoft Azure",
+  "loc.input.label.SimultaneousUpgrade": "Simultaneous upgrade",
+  "loc.input.help.SimultaneousUpgrade": "Updates all instances at once. Your cloud service will be unavailable during update.",
   "loc.input.label.ForceUpgrade": "Forzar actualización",
   "loc.input.help.ForceUpgrade": "Si selecciona esta opción, se fuerza la actualización, lo que podría dar lugar a la pérdida de datos locales.",
   "loc.input.label.DiagnosticStorageAccountKeys": "Claves de la cuenta de almacenamiento de diagnóstico",
@@ -45,4 +47,4 @@
   "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "La versión actual de Azure PowerShell no admite una cuenta de almacenamiento externa para configurar el diagnóstico.",
   "loc.messages.Addinganyconfiguredcustomcertificates": "Adding any configured custom certificates.",
   "loc.messages.Customcertificatesaredefinedininvalidformat": "Custom certificates are defined in invalid format."
-}
+}
diff --git a/Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/fr-fr/resources.resjson b/Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/fr-fr/resources.resjson
@@ -24,6 +24,8 @@
   "loc.input.help.AppendDateTimeToLabel": "Ajoute la date et l'heure actuelles à l'étiquette du déploiement",
   "loc.input.label.AllowUpgrade": "Autoriser la mise à niveau",
   "loc.input.help.AllowUpgrade": "L'option sélectionnée permet une mise à niveau du déploiement de Microsoft Azure",
+  "loc.input.label.SimultaneousUpgrade": "Simultaneous upgrade",
+  "loc.input.help.SimultaneousUpgrade": "Updates all instances at once. Your cloud service will be unavailable during update.",
   "loc.input.label.ForceUpgrade": "Forcer la mise à niveau",
   "loc.input.help.ForceUpgrade": "L'option sélectionnée définit une mise à niveau forcée, ce qui risque d'entraîner une perte des données locales.",
   "loc.input.label.DiagnosticStorageAccountKeys": "Clés de compte de stockage de diagnostics",
@@ -45,4 +47,4 @@
   "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "La version actuelle d'Azure PowerShell ne prend pas en charge les comptes de stockage externes pour la configuration des diagnostics.",
   "loc.messages.Addinganyconfiguredcustomcertificates": "Adding any configured custom certificates.",
   "loc.messages.Customcertificatesaredefinedininvalidformat": "Custom certificates are defined in invalid format."
-}
+}
diff --git a/Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/it-IT/resources.resjson b/Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/it-IT/resources.resjson
@@ -24,6 +24,8 @@
   "loc.input.help.AppendDateTimeToLabel": "Aggiunge la data e l'ora correnti all'etichetta della distribuzione",
   "loc.input.label.AllowUpgrade": "Consenti aggiornamento",
   "loc.input.help.AllowUpgrade": "Quando questa opzione è selezionata, consente di eseguire un aggiornamento alla distribuzione di Microsoft Azure",
+  "loc.input.label.SimultaneousUpgrade": "Simultaneous upgrade",
+  "loc.input.help.SimultaneousUpgrade": "Updates all instances at once. Your cloud service will be unavailable during update.",
   "loc.input.label.ForceUpgrade": "Forza aggiornamento",
   "loc.input.help.ForceUpgrade": "Quando questa opzione è selezionata, forza l'aggiornamento. Questa operazione potrebbe causare la perdita di dati locali.",
   "loc.input.label.DiagnosticStorageAccountKeys": "Chiavi dell'account di archiviazione di diagnostica",
@@ -45,4 +47,4 @@
   "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "La versione corrente di Azure PowerShell non supporta account di archiviazione esterni per la configurazione della diagnostica.",
   "loc.messages.Addinganyconfiguredcustomcertificates": "Adding any configured custom certificates.",
   "loc.messages.Customcertificatesaredefinedininvalidformat": "Custom certificates are defined in invalid format."
-}
+}
diff --git a/Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/ja-jp/resources.resjson b/Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/ja-jp/resources.resjson
@@ -24,6 +24,8 @@
   "loc.input.help.AppendDateTimeToLabel": "配置ラベルに現在の日付と時刻を追加します",
   "loc.input.label.AllowUpgrade": "アップグレードを許可",
   "loc.input.help.AllowUpgrade": "選択すると、Microsoft Azure 展開へのアップグレードが可能になります",
+  "loc.input.label.SimultaneousUpgrade": "Simultaneous upgrade",
+  "loc.input.help.SimultaneousUpgrade": "Updates all instances at once. Your cloud service will be unavailable during update.",
   "loc.input.label.ForceUpgrade": "強制アップグレード",
   "loc.input.help.ForceUpgrade": "選択すると、アップグレードは強制アップグレードに設定されます。これにより、ローカル データが失われる可能性があります。",
   "loc.input.label.DiagnosticStorageAccountKeys": "診断ストレージ アカウント キー",
@@ -45,4 +47,4 @@
   "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "Azure PowerShell の現在のバージョンでは、診断を構成するための外部ストレージ アカウントはサポートしていません。",
   "loc.messages.Addinganyconfiguredcustomcertificates": "Adding any configured custom certificates.",
   "loc.messages.Customcertificatesaredefinedininvalidformat": "Custom certificates are defined in invalid format."
-}
+}
diff --git a/Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/ko-KR/resources.resjson b/Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/ko-KR/resources.resjson
@@ -24,6 +24,8 @@
   "loc.input.help.AppendDateTimeToLabel": "배포 레이블에 현재 날짜와 시간을 추가합니다.",
   "loc.input.label.AllowUpgrade": "업그레이드 허용",
   "loc.input.help.AllowUpgrade": "선택할 경우 Microsoft Azure 배포에 대한 업그레이드가 허용됩니다.",
+  "loc.input.label.SimultaneousUpgrade": "Simultaneous upgrade",
+  "loc.input.help.SimultaneousUpgrade": "Updates all instances at once. Your cloud service will be unavailable during update.",
   "loc.input.label.ForceUpgrade": "강제 업그레이드",
   "loc.input.help.ForceUpgrade": "선택할 경우 강제 업그레이드로 업그레이드가 설정되어 잠재적으로 로컬 데이터 손실이 발생할 수 있습니다.",
   "loc.input.label.DiagnosticStorageAccountKeys": "진단 저장소 계정 키",
@@ -45,4 +47,4 @@
   "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "현재 버전의 Azure Powershell에서는 외부 저장소 계정을 사용하여 진단을 구성할 수 없습니다.",
   "loc.messages.Addinganyconfiguredcustomcertificates": "Adding any configured custom certificates.",
   "loc.messages.Customcertificatesaredefinedininvalidformat": "Custom certificates are defined in invalid format."
-}
+}
diff --git a/Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/ru-RU/resources.resjson b/Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/ru-RU/resources.resjson
@@ -1,3 +1,4 @@
+
 {
   "loc.friendlyName": "Развертывание облачной службы Azure",
   "loc.helpMarkDown": "[Подробнее...](https://go.microsoft.com/fwlink/?LinkID=613748)",
@@ -24,6 +25,8 @@
   "loc.input.help.AppendDateTimeToLabel": "Добавляет текущую дату и время в метку развертывания",
   "loc.input.label.AllowUpgrade": "Разрешить обновление",
   "loc.input.help.AllowUpgrade": "При выборе этого варианта выполняется обновление до развертывания Microsoft Azure.",
+  "loc.input.label.SimultaneousUpgrade": "Simultaneous upgrade",
+  "loc.input.help.SimultaneousUpgrade": "Updates all instances at once. Your cloud service will be unavailable during update.",
   "loc.input.label.ForceUpgrade": "Принудительное обновление",
   "loc.input.help.ForceUpgrade": "При выборе этого варианта выполняется принудительное обновление, которое может привести к потере локальных данных.",
   "loc.input.label.DiagnosticStorageAccountKeys": "Ключи учетной записи хранения диагностики",
@@ -45,4 +48,4 @@
   "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "Текущая версия Azure PowerShell не поддерживает настройку диагностики с использованием внешней учетной записи хранения.",
   "loc.messages.Addinganyconfiguredcustomcertificates": "Adding any configured custom certificates.",
   "loc.messages.Customcertificatesaredefinedininvalidformat": "Custom certificates are defined in invalid format."
-}
+}
diff --git a/Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/zh-CN/resources.resjson b/Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/zh-CN/resources.resjson
@@ -24,6 +24,8 @@
   "loc.input.help.AppendDateTimeToLabel": "将当前的日期和时间追加到部署标签",
   "loc.input.label.AllowUpgrade": "允许升级",
   "loc.input.help.AllowUpgrade": "选中后，可以升级到 Microsoft Azure 部署",
+  "loc.input.label.SimultaneousUpgrade": "Simultaneous upgrade",
+  "loc.input.help.SimultaneousUpgrade": "Updates all instances at once. Your cloud service will be unavailable during update.",
   "loc.input.label.ForceUpgrade": "强制升级",
   "loc.input.help.ForceUpgrade": "选中后会将升级设置为强制升级，这可能导致本地数据丢失。",
   "loc.input.label.DiagnosticStorageAccountKeys": "诊断存储帐户密钥",
@@ -45,4 +47,4 @@
   "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "当前版本的 azure powershell 不支持外部存储帐户来配置诊断。",
   "loc.messages.Addinganyconfiguredcustomcertificates": "Adding any configured custom certificates.",
   "loc.messages.Customcertificatesaredefinedininvalidformat": "Custom certificates are defined in invalid format."
-}
+}
diff --git a/Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/zh-TW/resources.resjson b/Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/zh-TW/resources.resjson
@@ -24,6 +24,8 @@
   "loc.input.help.AppendDateTimeToLabel": "將目前的日期與時間附加到部署標籤",
   "loc.input.label.AllowUpgrade": "允許升級",
   "loc.input.help.AllowUpgrade": "選取此選項表示允許升級為 Microsoft Azure 部署",
+  "loc.input.label.SimultaneousUpgrade": "Simultaneous upgrade",
+  "loc.input.help.SimultaneousUpgrade": "Updates all instances at once. Your cloud service will be unavailable during update.",
   "loc.input.label.ForceUpgrade": "強制升級",
   "loc.input.help.ForceUpgrade": "選取此選項會將升級設為強制升級。這可能會導致本機資料遺失。",
   "loc.input.label.DiagnosticStorageAccountKeys": "診斷儲存體帳戶金鑰",
@@ -45,4 +47,4 @@
   "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "Azure PowerShell 目前的版本不支援外部儲存體帳戶設定診斷。",
   "loc.messages.Addinganyconfiguredcustomcertificates": "Adding any configured custom certificates.",
   "loc.messages.Customcertificatesaredefinedininvalidformat": "Custom certificates are defined in invalid format."
-}
+}
diff --git a/Tasks/AzureCloudPowerShellDeployment/task.json b/Tasks/AzureCloudPowerShellDeployment/task.json
@@ -15,7 +15,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 1,
-        "Minor": 2,
+        "Minor": 3,
         "Patch": 1
     },
     "demands": [
@@ -121,6 +121,15 @@
             "helpMarkDown": "When selected allows an upgrade to the Microsoft Azure deployment",
             "required": true
         },
+        {
+            "name": "SimultaneousUpgrade",
+            "type": "boolean",
+            "label": "Simultaneous upgrade",
+            "defaultValue": "false",
+            "visibleRule": "AllowUpgrade == true",
+            "helpMarkDown": "Updates all instances at once. Your cloud service will be unavailable during update.",
+            "required": false
+        },
         {
             "name": "ForceUpgrade",
             "type": "boolean",

diff --git a/Tasks/AzureCloudPowerShellDeployment/task.loc.json b/Tasks/AzureCloudPowerShellDeployment/task.loc.json
@@ -15,7 +15,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 2,
+    "Minor": 3,
     "Patch": 1
   },
   "demands": [
@@ -134,6 +134,15 @@
       "helpMarkDown": "ms-resource:loc.input.help.ForceUpgrade",
       "required": false
     },
+    {
+      "name": "SimultaneousUpgrade",
+      "type": "boolean",
+      "label": "ms-resource:loc.input.label.SimultaneousUpgrade",
+      "defaultValue": "false",
+      "visibleRule": "AllowUpgrade == true",
+      "helpMarkDown": "ms-resource:loc.input.help.SimultaneousUpgrade",
+      "required": false
+    },
     {
       "name": "DiagnosticStorageAccountKeys",
       "type": "multiLine",
@@ -225,4 +234,4 @@
     "Customcertificatesaredefinedininvalidformat": "ms-resource:loc.messages.Customcertificatesaredefinedininvalidformat",
     "Addinganyconfiguredcustomcertificates": "ms-resource:loc.messages.Addinganyconfiguredcustomcertificates"
   }
-}
+}