Skip to content

Commit 02c4d6a

Browse files
authored
Merge pull request #109426 from djpmsft/docUpdates
fixing image in cicd doc
2 parents 59523d5 + 8d6c6bb commit 02c4d6a

File tree

1 file changed

+35
-35
lines changed

1 file changed

+35
-35
lines changed

articles/data-factory/continuous-integration-deployment.md

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -149,16 +149,16 @@ There are two ways to handle secrets:
149149

150150
```json
151151
{
152-
"parameters": {
153-
"azureSqlReportingDbPassword": {
154-
"reference": {
155-
"keyVault": {
156-
"id": "/subscriptions/<subId>/resourceGroups/<resourcegroupId> /providers/Microsoft.KeyVault/vaults/<vault-name> "
157-
},
158-
"secretName": " < secret - name > "
159-
}
160-
}
161-
}
152+
"parameters": {
153+
"azureSqlReportingDbPassword": {
154+
"reference": {
155+
"keyVault": {
156+
"id": "/subscriptions/<subId>/resourceGroups/<resourcegroupId> /providers/Microsoft.KeyVault/vaults/<vault-name> "
157+
},
158+
"secretName": " < secret - name > "
159+
}
160+
}
161+
}
162162
}
163163
```
164164

@@ -209,7 +209,7 @@ When running a post-deployment script, you will need to specify a variation of t
209209

210210
`-armTemplate "$(System.DefaultWorkingDirectory)/<your-arm-template-location>" -ResourceGroupName <your-resource-group-name> -DataFactoryName <your-data-factory-name> -predeployment $false -deleteDeployment $true`
211211

212-
![Azure PowerShell task](media/continuous-integration-deployment/continuous-integration-image11.png)
212+
![Azure PowerShell task](media/continuous-integration-deployment/continuous-integration-image11.png)
213213

214214
Here is the script that can be used for pre- and post-deployment. It accounts for deleted resources and resource references.
215215

@@ -362,12 +362,12 @@ if ($predeployment -eq $true) {
362362
$triggerstostop | ForEach-Object {
363363
Write-host "Disabling trigger " $_
364364
Remove-AzDataFactoryV2TriggerSubscription -ResourceGroupName $ResourceGroupName -DataFactoryName $DataFactoryName -Name $_ -Force
365-
$status = Get-AzDataFactoryV2TriggerSubscriptionStatus -ResourceGroupName $ResourceGroupName -DataFactoryName $DataFactoryName -Name $_
366-
while ($status.Status -ne "Disabled"){
367-
Start-Sleep -s 15
368-
$status = Get-AzDataFactoryV2TriggerSubscriptionStatus -ResourceGroupName $ResourceGroupName -DataFactoryName $DataFactoryName -Name $_
369-
}
370-
Stop-AzDataFactoryV2Trigger -ResourceGroupName $ResourceGroupName -DataFactoryName $DataFactoryName -Name $_ -Force
365+
$status = Get-AzDataFactoryV2TriggerSubscriptionStatus -ResourceGroupName $ResourceGroupName -DataFactoryName $DataFactoryName -Name $_
366+
while ($status.Status -ne "Disabled"){
367+
Start-Sleep -s 15
368+
$status = Get-AzDataFactoryV2TriggerSubscriptionStatus -ResourceGroupName $ResourceGroupName -DataFactoryName $DataFactoryName -Name $_
369+
}
370+
Stop-AzDataFactoryV2Trigger -ResourceGroupName $ResourceGroupName -DataFactoryName $DataFactoryName -Name $_ -Force
371371
}
372372
}
373373
else {
@@ -461,12 +461,12 @@ else {
461461
$activeTriggerNames | ForEach-Object {
462462
Write-host "Enabling trigger " $_
463463
Add-AzDataFactoryV2TriggerSubscription -ResourceGroupName $ResourceGroupName -DataFactoryName $DataFactoryName -Name $_ -Force
464-
$status = Get-AzDataFactoryV2TriggerSubscriptionStatus -ResourceGroupName $ResourceGroupName -DataFactoryName $DataFactoryName -Name $_
465-
while ($status.Status -ne "Enabled"){
466-
Start-Sleep -s 15
467-
$status = Get-AzDataFactoryV2TriggerSubscriptionStatus -ResourceGroupName $ResourceGroupName -DataFactoryName $DataFactoryName -Name $_
468-
}
469-
Start-AzDataFactoryV2Trigger -ResourceGroupName $ResourceGroupName -DataFactoryName $DataFactoryName -Name $_ -Force
464+
$status = Get-AzDataFactoryV2TriggerSubscriptionStatus -ResourceGroupName $ResourceGroupName -DataFactoryName $DataFactoryName -Name $_
465+
while ($status.Status -ne "Enabled"){
466+
Start-Sleep -s 15
467+
$status = Get-AzDataFactoryV2TriggerSubscriptionStatus -ResourceGroupName $ResourceGroupName -DataFactoryName $DataFactoryName -Name $_
468+
}
469+
Start-AzDataFactoryV2Trigger -ResourceGroupName $ResourceGroupName -DataFactoryName $DataFactoryName -Name $_ -Force
470470
}
471471
}
472472
```
@@ -565,7 +565,7 @@ Here's an example of what a parameterization template might look like:
565565
Here's an explanation of how the preceding template is constructed, broken down by resource type.
566566

567567
#### Pipelines
568-
568+
569569
* Any property in the path `activities/typeProperties/waitTimeInSeconds` is parameterized. Any activity in a pipeline that has a code-level property named `waitTimeInSeconds` (for example, the `Wait` activity) is parameterized as a number, with a default name. But it won't have a default value in the Resource Manager template. It will be a mandatory input during the Resource Manager deployment.
570570
* Similarly, a property called `headers` (for example, in a `Web` activity) is parameterized with type `object` (JObject). It has a default value, which is the same value as that of the source factory.
571571

@@ -777,7 +777,7 @@ The following example shows how to add a single value to the default parameteriz
777777
"database": "=",
778778
"serviceEndpoint": "=",
779779
"batchUri": "=",
780-
"poolName": "=",
780+
"poolName": "=",
781781
"databaseName": "=",
782782
"systemNumber": "=",
783783
"server": "=",
@@ -831,25 +831,25 @@ If you don't have Git configured, you can access the linked templates via **Expo
831831

832832
If you deploy a factory to production and realize there's a bug that needs to be fixed right away, but you can't deploy the current collaboration branch, you might need to deploy a hotfix. This approach is as known as quick-fix engineering or QFE.
833833

834-
1. In Azure DevOps, go to the release that was deployed to production. Find the last commit that was deployed.
834+
1. In Azure DevOps, go to the release that was deployed to production. Find the last commit that was deployed.
835835

836-
2. From the commit message, get the commit ID of the collaboration branch.
836+
2. From the commit message, get the commit ID of the collaboration branch.
837837

838-
3. Create a new hotfix branch from that commit.
838+
3. Create a new hotfix branch from that commit.
839839

840-
4. Go to the Azure Data Factory UX and switch to the hotfix branch.
840+
4. Go to the Azure Data Factory UX and switch to the hotfix branch.
841841

842-
5. By using the Azure Data Factory UX, fix the bug. Test your changes.
842+
5. By using the Azure Data Factory UX, fix the bug. Test your changes.
843843

844-
6. After the fix is verified, select **Export ARM Template** to get the hotfix Resource Manager template.
844+
6. After the fix is verified, select **Export ARM Template** to get the hotfix Resource Manager template.
845845

846-
7. Manually check this build into the adf_publish branch.
846+
7. Manually check this build into the adf_publish branch.
847847

848-
8. If you've configured your release pipeline to automatically trigger based on adf_publish check-ins, a new release will start automatically. Otherwise, manually queue a release.
848+
8. If you've configured your release pipeline to automatically trigger based on adf_publish check-ins, a new release will start automatically. Otherwise, manually queue a release.
849849

850-
9. Deploy the hotfix release to the test and production factories. This release contains the previous production payload plus the fix that you made in step 5.
850+
9. Deploy the hotfix release to the test and production factories. This release contains the previous production payload plus the fix that you made in step 5.
851851

852-
10. Add the changes from the hotfix to the development branch so that later releases won't include the same bug.
852+
10. Add the changes from the hotfix to the development branch so that later releases won't include the same bug.
853853

854854
## Best practices for CI/CD
855855

0 commit comments

Comments
 (0)