Skip to content

Commit 10048bb

Browse files
committed
touchups
1 parent 8317c1d commit 10048bb

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

articles/batch/batch-ci-cd.md

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -399,8 +399,8 @@ The following example demonstrates how to deploy an infrastructure with template
399399
|**location**|Location for the Azure resources to be deployed|
400400
|**resourceGroupName**|Name of the resource group where your resources are deployed|
401401
|**storageAccountName**|Name of the storage account that holds the linked ARM templates|
402-
|**StorageContainerSasToken**|*$(\<Reference name from Azure File Copy Output Variables>.StorageContainerSasToken)*.
403-
|**StorageContainerUri**|*$(\<Reference name from Azure File Copy Output Variables>.StorageContainerUri)*.
402+
|**StorageContainerSasToken**|*$(\<Reference name from Azure File Copy Output Variables>.StorageContainerSasToken)*
403+
|**StorageContainerUri**|*$(\<Reference name from Azure File Copy Output Variables>.StorageContainerUri)*
404404
405405
![Screenshot showing variables set for the Azure Pipelines release.](media/batch-ci-cd/variables.png)
406406
@@ -433,68 +433,68 @@ For each new task that the following steps specify:
433433
![Screenshot showing the tasks used to release the HPC Application to Azure Batch.](media/batch-ci-cd/release-pipeline.png)
434434
435435
1. Select the **Download Pipeline Artifacts** task, and set the following properties:
436-
- **Display name**: *Download ApplicationPackage to Agent*
437-
- **Artifact name**: *hpc-application*
438-
- **Destination directory**: *$(System.DefaultWorkingDirectory)*
436+
- **Display name**: Enter *Download ApplicationPackage to Agent*.
437+
- **Artifact name**: Enter *hpc-application*.
438+
- **Destination directory**: Enter *$(System.DefaultWorkingDirectory)*.
439439
440440
1. Create a Storage account to store your ARM templates. You could use an existing storage account, but to support this self-contained example and isolation of content, make a dedicated storage account.
441441
442442
Select the **ARM Template deployment: Resource Group scope** task, and set the following properties:
443-
- **Display name:** *Deploy storage account for ARM templates*
443+
- **Display name:** Enter *Deploy storage account for ARM templates*.
444444
- **Azure Resource Manager connection**: Select the service connection to use.
445445
- **Subscription:** Select the appropriate Azure subscription.
446446
- **Action**: Select **Create or update resource group**.
447-
- **Resource group**: *$(resourceGroupName)*
448-
- **Location**: *$(location)*
449-
- **Template**: *$(System.ArtifactsDirectory)/\<AzureRepoArtifactSourceAlias>/arm-templates/storageAccount.json*
450-
- **Override template parameters**: `-accountName $(storageAccountName)`
447+
- **Resource group**: Enter *$(resourceGroupName)*.
448+
- **Location**: Enter *$(location)*.
449+
- **Template**: Enter *$(System.ArtifactsDirectory)/\<AzureRepoArtifactSourceAlias>/arm-templates/storageAccount.json*.
450+
- **Override template parameters**: Enter *-accountName $(storageAccountName)*.
451451
452452
1. Upload the artifacts from source control into the storage account. As part of this Azure Pipelines task, the Storage account container URI and SAS token are output to a variable in Azure Pipelines, so they can be reused throughout this agent phase.
453453
454454
Select the **Azure File Copy** task, and set the following properties:
455-
- **Display name:** *AzureBlob File Copy*
456-
- **Source:** *$(System.ArtifactsDirectory)/\<AzureRepoArtifactSourceAlias>/arm-templates/*
455+
- **Display name:** Enter *AzureBlob File Copy*.
456+
- **Source:** Enter *$(System.ArtifactsDirectory)/\<AzureRepoArtifactSourceAlias>/arm-templates/*.
457457
- **Azure Subscription:** Select the appropriate Azure subscription.
458-
- **Destination Type**: *Azure Blob*
459-
- **RM Storage Account**: *$(storageAccountName)*
460-
- **Container Name**: *templates*
461-
- **Reference name** under **Output Variables**: *ffmpeg*
458+
- **Destination Type**: Select **Azure Blob**.
459+
- **RM Storage Account**: Enter *$(storageAccountName)*.
460+
- **Container Name**: Enter *templates*.
461+
- **Reference name**: Expand **Output Variables**, then enter *ffmpeg*.
462462
463463
>[!NOTE]
464-
>If this step fails, make sure your Azure DevOps organization has **Storage Blob Contributor** role in the storage account created.
464+
>If this step fails, make sure your Azure DevOps organization has **Storage Blob Contributor** role in the storage account.
465465
466466
1. Deploy the orchestrator ARM template to create the Batch account and pool. This template includes parameters for the Storage account container URI and SAS token. The variables required in the ARM template are held in the variables section of the release definition and were set from the AzureBlob File Copy task.
467467
468468
Select the **ARM Template deployment: Resource Group scope** task, and set the following properties:
469-
- **Display name:** *Deploy Azure Batch*
469+
- **Display name:** Enter *Deploy Azure Batch*.
470470
- **Azure Resource Manager connection:** Select the appropriate Azure subscription.
471471
- **Subscription:** Select the appropriate Azure subscription.
472472
- **Action**: Select **Create or update resource group**.
473-
- **Resource group**: *$(resourceGroupName)*
474-
- **Location**: *$(location)*
473+
- **Resource group**: Enter *$(resourceGroupName)*.
474+
- **Location**: Enter *$(location)*.
475475
- **Template location**: Select **URL of the file**.
476-
- **Template link:** *$(StorageContainerUri)arm-templates/deployment.json$(StorageContainerSasToken)*
477-
- **Override template parameters**: `-StorageContainerUri $(StorageContainerUri) -StorageContainerSasToken $(StorageContainerSasToken) -applicationStorageAccountName $(applicationStorageAccountName) -batchAccountName $(batchAccountName) -batchAccountPoolName $(batchAccountPoolName)`
476+
- **Template link:** Enter *$(StorageContainerUri)arm-templates/deployment.json$(StorageContainerSasToken)*.
477+
- **Override template parameters**: Enter *-StorageContainerUri $(StorageContainerUri) -StorageContainerSasToken $(StorageContainerSasToken) -applicationStorageAccountName $(applicationStorageAccountName) -batchAccountName $(batchAccountName) -batchAccountPoolName $(batchAccountPoolName)*.
478478
479479
A common practice is to use Azure Key Vault tasks. If the service principal connected to your Azure subscription has an appropriate access policy set, it can download secrets from Key Vault and be used as a variable in your pipeline. The name of the secret is set with the associated value. For example, you could reference a secret of **sshPassword** with *$(sshPassword)* in the release definition.
480480
481481
1. Call Azure CLI to create an application in Azure Batch and upload associated packages.
482482
483483
Select the **Azure CLI** task, and set the following properties:
484-
- **Display name:** *Create application in Azure Batch account*
484+
- **Display name:** Enter *Create application in Azure Batch account*.
485485
- **Azure Resource Manager connection:** Select the appropriate Azure subscription.
486486
- **Script Type**: Select **PowerShell Core**.
487487
- **Script Location**: Select **Inline script**.
488-
- **Inline Script**: `az batch application create --application-name $(batchAccountApplicationName) --name $(batchAccountName) --resource-group $(resourceGroupName)`
488+
- **Inline Script**: Enter *az batch application create --application-name $(batchAccountApplicationName) --name $(batchAccountName) --resource-group $(resourceGroupName)*.
489489
490490
1. Call Azure CLI to upload associated packages to the application, in this case the ffmpeg files.
491491
492492
Select the **Azure CLI** task, and set the following properties:
493-
- **Display name:** *Upload package to Azure Batch account*
493+
- **Display name:** Enter *Upload package to Azure Batch account*.
494494
- **Azure Resource Manager connection:** Select the appropriate Azure subscription.
495495
- **Script Type**: Select **PowerShell Core**.
496496
- **Script Location**: Select **Inline script**.
497-
- **Inline Script**: `az batch application package create --application-name $(batchAccountApplicationName) --name $(batchAccountName) --resource-group $(resourceGroupName) --version $(batchApplicationVersion) --package-file=$(System.DefaultWorkingDirectory)/$(Release.Artifacts.<AzureBuildArtifactSourceAlias>.BuildId).zip`
497+
- **Inline Script**: Enter *az batch application package create --application-name $(batchAccountApplicationName) --name $(batchAccountName) --resource-group $(resourceGroupName) --version $(batchApplicationVersion) --package-file=$(System.DefaultWorkingDirectory)/$(Release.Artifacts.<AzureBuildArtifactSourceAlias>.BuildId).zip*.
498498
499499
> [!NOTE]
500500
> The version number of the application package is set to a variable. The variable allows overwriting previous versions of the package and lets you manually control the package version pushed to Azure Batch.
5.54 KB
Loading

0 commit comments

Comments
 (0)