Merge pull request #199226 from carlrab/azurecli-docs-batch

updated parent files for scripts

Author: hmacgregor1

articles/batch/scripts/batch-cli-sample-add-application.md

@@ -2,33 +2,61 @@
 title: Azure CLI Script Example - Add an Application in Batch | Microsoft Docs
 description: Learn how to add an application for use with an Azure Batch pool or a task using the Azure CLI.
 ms.topic: sample
-ms.date: 09/17/2021
+ms.date: 05/24/2022
 ms.custom: devx-track-azurecli, seo-azure-cli
 keywords: batch, azure cli samples, azure cli code samples, azure cli script samples
 ---
 
 # CLI example: Add an application to an Azure Batch account
 
-This script demonstrates how to add an application for use with an Azure Batch pool or task. To set up an application to add to your Batch account, package your executable, together with any dependencies, into a zip file. 
+This script demonstrates how to add an application for use with an Azure Batch pool or task. To set up an application to add to your Batch account, package your executable, together with any dependencies, into a zip file.
+
+[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
 
 [!INCLUDE [azure-cli-prepare-your-environment.md](../../../includes/azure-cli-prepare-your-environment.md)]
 
- - This tutorial requires version 2.0.20 or later of the Azure CLI. If using Azure Cloud Shell, the latest version is already installed. 
+## Sample script
+
+[!INCLUDE [cli-launch-cloud-shell-sign-in.md](../../../includes/cli-launch-cloud-shell-sign-in.md)]
+
+### Create batch account and new application
+
+:::code language="azurecli" source="~/azure_cli_scripts/batch/add-application/add-application.sh" id="FullScript":::
+
+### Create batch application package
 
-## Example script
+An application can reference multiple application executable packages of different versions. The executables and any dependencies need to be zipped up for the package. Once uploaded, the CLI attempts to activate the package so that it's ready for use.
 
-[!code-azurecli-interactive[main](../../../cli_scripts/batch/add-application/add-application.sh "Add Application")]
+```azurecli
+az batch application package create \
+    --resource-group $resourceGroup \
+    --name $batchAccount \
+    --application-name "MyApplication" \
+    --package-file my-application-exe.zip \
+    --version-name 1.0
+```
+
+### Update the application
+
+Update the application to assign the newly added application package as the default version.
+
+```azurecli
+az batch application set \
+    --resource-group $resourceGroup \
+    --name $batchAccount \
+    --application-name "MyApplication" \
+    --default-version 1.0
+```
 
-## Clean up deployment
+## Clean up resources
 
-Run the following command to remove the
-resource group and all resources associated with it.
+[!INCLUDE [cli-clean-up-resources.md](../../../includes/cli-clean-up-resources.md)]
 
-```azurecli-interactive
-az group delete --name myResourceGroup
+```azurecli
+az group delete --name $resourceGroup
 ```
 
-## Script explanation
+## Sample reference
 
 This script uses the following commands.
 Each command in the table links to command-specific documentation.

articles/batch/scripts/batch-cli-sample-create-account.md

@@ -1,36 +1,38 @@
 ---
 title: Azure CLI Script Example - Create Batch account - Batch service | Microsoft Docs
-description: Learn how to create a Batch account in Batch service mode with this Azure CLI script example. This also script shows how to query or update various properties of the account.
+description: Learn how to create a Batch account in Batch service mode with this Azure CLI script example. This script also shows how to query or update various properties of the account.
 ms.topic: sample
-ms.date: 09/17/2021
+ms.date: 05/24/2022
 ms.custom: devx-track-azurecli, seo-azure-cli
 keywords: batch, azure cli samples, azure cli code samples, azure cli script samples
 ---
 
 # CLI example: Create a Batch account in Batch service mode
 
 This script creates an Azure Batch account in Batch service mode and shows how to query or update various properties of the account. When you create a Batch account in the default Batch service mode, its compute nodes are assigned internally by the Batch
-service. Allocated compute nodes are subject to a separate vCPU (core) quota and the account can be 
-authenticated either via shared key credentials or an Azure Active Directory token.
+service. Allocated compute nodes are subject to a separate vCPU (core) quota and the account can be authenticated either via shared key credentials or an Azure Active Directory token.
+
+[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
 
 [!INCLUDE [azure-cli-prepare-your-environment.md](../../../includes/azure-cli-prepare-your-environment.md)]
 
-- This tutorial requires version 2.0.20 or later of the Azure CLI. If using Azure Cloud Shell, the latest version is already installed. 
+## Sample script
+
+[!INCLUDE [cli-launch-cloud-shell-sign-in.md](../../../includes/cli-launch-cloud-shell-sign-in.md)]
 
-## Example script
+### Run the script
 
-[!code-azurecli-interactive[main](../../../cli_scripts/batch/create-account/create-account.sh "Create Account")]
+:::code language="azurecli" source="~/azure_cli_scripts/batch/create-account/create-account.sh" id="FullScript":::
 
-## Clean up deployment
+## Clean up resources
 
-Run the following command to remove the
-resource group and all resources associated with it.
+[!INCLUDE [cli-clean-up-resources.md](../../../includes/cli-clean-up-resources.md)]
 
-```azurecli-interactive
-az group delete --name myResourceGroup
+```azurecli
+az group delete --name $resourceGroup
 ```
 
-## Script explanation
+## Sample reference
 
 This script uses the following commands. Each command in the table links to command-specific documentation.
 

articles/batch/scripts/batch-cli-sample-create-user-subscription-account.md

@@ -2,7 +2,7 @@
 title: Azure CLI Script Example - Create Batch account - user subscription | Microsoft Docs
 description: Learn how to create an Azure Batch account in user subscription mode. This account allocates compute nodes into your subscription.
 ms.topic: sample
-ms.date: 09/17/2021
+ms.date: 05/24/2022 
 ms.custom: devx-track-azurecli, seo-azure-cli
 keywords: batch, azure cli samples, azure cli examples, azure cli code samples
 ---
@@ -11,23 +11,27 @@ keywords: batch, azure cli samples, azure cli examples, azure cli code samples
 
 This script creates an Azure Batch account in user subscription mode. An account that allocates compute nodes into your subscription must be authenticated via an Azure Active Directory token. The compute nodes allocated count toward your subscription's vCPU (core) quota.
 
+[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
+
 [!INCLUDE [azure-cli-prepare-your-environment.md](../../../includes/azure-cli-prepare-your-environment.md)]
 
-- This tutorial requires version 2.0.20 or later of the Azure CLI. If using Azure Cloud Shell, the latest version is already installed.  
+## Sample script
+
+[!INCLUDE [cli-launch-cloud-shell-sign-in.md](../../../includes/cli-launch-cloud-shell-sign-in.md)]
 
-## Example script
+### Run the script
 
-[!code-azurecli-interactive[main](../../../cli_scripts/batch/create-account/create-account-user-subscription.sh "Create Account using user subscription")]
+:::code language="azurecli" source="~/azure_cli_scripts/batch/create-account/create-account-user-subscription.sh" id="FullScript":::
 
-## Clean up deployment
+## Clean up resources
 
-Run the following command to remove the resource group and all resources associated with it.
+[!INCLUDE [cli-clean-up-resources.md](../../../includes/cli-clean-up-resources.md)]
 
-```azurecli-interactive
-az group delete --name myResourceGroup
+```azurecli
+az group delete --name $resourceGroup
 ```
 
-## Script explanation
+## Sample reference
 
 This script uses the following commands. Each command in the table links to command-specific documentation.
 

articles/batch/scripts/batch-cli-sample-manage-linux-pool.md

@@ -2,7 +2,7 @@
 title: Azure CLI Script Example - Linux Pool in Batch | Microsoft Docs
 description: Learn the commands available in the Azure CLI to create and manage a pool of Linux compute nodes in Azure Batch.
 ms.topic: sample
-ms.date: 09/17/2021 
+ms.date: 05/24/2022 
 ms.custom: devx-track-azurecli, seo-azure-cli
 keywords: linux, azure cli samples, azure cli code samples, azure cli script samples
 ---
@@ -11,24 +11,48 @@ keywords: linux, azure cli samples, azure cli code samples, azure cli script sam
 
 This script demonstrates some of the commands available in the Azure CLI to create and manage a pool of Linux compute nodes in Azure Batch.
 
+[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
+
 [!INCLUDE [azure-cli-prepare-your-environment.md](../../../includes/azure-cli-prepare-your-environment.md)]
 
-- This tutorial requires version 2.0.20 or later of the Azure CLI. If using Azure Cloud Shell, the latest version is already installed. 
+## Sample script
+
+[!INCLUDE [cli-launch-cloud-shell-sign-in.md](../../../includes/cli-launch-cloud-shell-sign-in.md)]
+
+### To create a Linux pool in Azure Batch
+
+:::code language="azurecli" source="~/azure_cli_scripts/batch/manage-pool/manage-pool-linux.sh" id="FullScript":::
+
+### To reboot a batch node
 
-## Example script
+If a particular node in the pool is having issues, it can be rebooted or reimaged. The ID of the node can be retrieved with the list command above. A typical node ID is in the format `tvm-xxxxxxxxxx_1-<timestamp>`.
 
-[!code-azurecli-interactive[main](../../../cli_scripts/batch/manage-pool/manage-pool-linux.sh "Manage Linux Virtual Machine Pool")]
+```azurecli
+az batch node reboot \
+    --pool-id mypool-linux \
+    --node-id tvm-123_1-20170316t000000z
+```
+
+### To delete a batch node
+
+One or more compute nodes can be deleted from the pool, and any work already assigned to it can be re-allocated to another node.
+
+```azurecli
+az batch node delete \
+    --pool-id mypool-linux \
+    --node-list tvm-123_1-20170316t000000z tvm-123_2-20170316t000000z \
+    --node-deallocation-option requeue
+```
 
-## Clean up deployment
+## Clean up resources
 
-Run the following command to remove the
-resource group and all resources associated with it.
+[!INCLUDE [cli-clean-up-resources.md](../../../includes/cli-clean-up-resources.md)]
 
-```azurecli-interactive
-az group delete --name myResourceGroup
+```azurecli
+az group delete --name $resourceGroup
 ```
 
-## Script explanation
+## Sample reference
 
 This script uses the following commands. Each command in the table links to command-specific documentation.
 

articles/batch/scripts/batch-cli-sample-manage-windows-pool.md

@@ -2,35 +2,37 @@
 title: Azure CLI Script Example - Windows Pool in Batch | Microsoft Docs
 description: Learn some of the commands available in the Azure CLI to create and manage a pool of Windows compute nodes in Azure Batch.
 ms.topic: sample
-ms.date: 09/17/2021
+ms.date: 05/24/2022 
 ms.custom: devx-track-azurecli, seo-azure-cli
 keywords: windows pool, azure cli samples, azure cli code samples, azure cli script samples
 ---
 
 # CLI example: Create and manage a Windows pool in Azure Batch
 
 This script demonstrates some of the commands available in the Azure CLI to create and
-manage a pool of Windows compute nodes in Azure Batch. A Windows pool can be configured in two ways, with either a Cloud Services configuration 
-or a Virtual Machine configuration. This example shows how to create a Windows pool with the Cloud Services configuration.
+manage a pool of Windows compute nodes in Azure Batch. A Windows pool can be configured in two ways, with either a Cloud Services configuration or a Virtual Machine configuration. This example shows how to create a Windows pool with the Cloud Services configuration.
+
+[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
 
 [!INCLUDE [azure-cli-prepare-your-environment.md](../../../includes/azure-cli-prepare-your-environment.md)]
 
-- This tutorial requires version 2.0.20 or later of the Azure CLI. If using Azure Cloud Shell, the latest version is already installed. 
+## Sample script
+
+[!INCLUDE [cli-launch-cloud-shell-sign-in.md](../../../includes/cli-launch-cloud-shell-sign-in.md)]
 
-## Example script
+### Run the script
 
-[!code-azurecli-interactive[main](../../../cli_scripts/batch/manage-pool/manage-pool-windows.sh "Manage Windows Cloud Services Pool")]
+:::code language="azurecli" source="~/azure_cli_scripts/batch/manage-pool/manage-pool-windows.sh" id="FullScript":::
 
-## Clean up deployment
+## Clean up resources
 
-Run the following command to remove the
-resource group and all resources associated with it.
+[!INCLUDE [cli-clean-up-resources.md](../../../includes/cli-clean-up-resources.md)]
 
-```azurecli-interactive
-az group delete --name myResourceGroup
+```azurecli
+az group delete --name $resourceGroup
 ```
 
-## Script explanation
+## Sample reference
 
 This script uses the following commands. Each command in the table links to command-specific documentation.
 

articles/batch/scripts/batch-cli-sample-run-job.md

@@ -2,34 +2,70 @@
 title: Azure CLI Script Example - Run a Batch job | Microsoft Docs
 description: Learn how to create a Batch job and add a series of tasks to the job using the Azure CLI. This article also shows how to monitor a job and its tasks.
 ms.topic: sample
-ms.date: 09/17/2021
+ms.date: 05/24/2022 
 ms.custom: devx-track-azurecli, seo-azure-cli
 keywords: batch, batch job, monitor job, azure cli samples, azure cli code samples, azure cli script samples
 ---
 
 # CLI example: Run a job and tasks with Azure Batch
 
-This script creates a Batch job and adds a series of tasks to the job. It also demonstrates
-how to monitor a job and its tasks. 
+This script creates a Batch job and adds a series of tasks to the job. It also demonstrates how to monitor a job and its tasks.
+
+[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
 
 [!INCLUDE [azure-cli-prepare-your-environment.md](../../../includes/azure-cli-prepare-your-environment.md)]
 
-- This tutorial requires version 2.0.20 or later of the Azure CLI. If using Azure Cloud Shell, the latest version is already installed. 
+## Sample script
+
+[!INCLUDE [cli-launch-cloud-shell-sign-in.md](../../../includes/cli-launch-cloud-shell-sign-in.md)]
+
+### Create a Batch account in Batch service mode
+
+:::code language="azurecli" source="~/azure_cli_scripts/batch/run-job/run-job.sh" id="FullScript":::
+
+### To add many tasks at once
+
+To add many tasks at once, specify the tasks in a JSON file, and pass it to the command. For format, see https://github.com/Azure/azure-docs-cli-python-samples/blob/master/batch/run-job/tasks.json. Provide the absolute path to the JSON file. For an example JSON file, see https://github.com/Azure-Samples/azure-cli-samples/blob/master/batch/run-job/tasks.json.
+
+```azurecli
+az batch task create \
+    --job-id myjob \
+    --json-file tasks.json
+```
+
+### To update the job
+
+Update the job so that it is automatically marked as completed once all the tasks are finished.
+
+```azurecli
+az batch job set \
+--job-id myjob \
+--on-all-tasks-complete terminatejob
+```
+
+### To monitor the status of the job
+
+```azurecli
+az batch job show --job-id myjob
+```
 
-## Example script
+### To monitor the status of a task
 
-[!code-azurecli-interactive[main](../../../cli_scripts/batch/run-job/run-job.sh "Run Job")]
+```azurecli
+az batch task show \
+    --job-id myjob \
+    --task-id task1
+```
 
-## Clean up deployment
+## Clean up resources
 
-Run the following command to remove the
-resource group and all resources associated with it.
+[!INCLUDE [cli-clean-up-resources.md](../../../includes/cli-clean-up-resources.md)]
 
-```azurecli-interactive
-az group delete --name myResourceGroup
+```azurecli
+az group delete --name $resourceGroup
 ```
 
-## Script explanation
+## Sample reference
 
 This script uses the following commands. Each command in the table links to command-specific documentation.