Skip to content

Commit 172f4fd

Browse files
Merge pull request #279054 from jonburchel/2024-06-24-merge-public-prs
2024 06 24 merge public prs
2 parents 8232060 + b4c553c commit 172f4fd

File tree

2 files changed

+16
-13
lines changed

2 files changed

+16
-13
lines changed

articles/data-factory/continuous-integration-delivery-automate-azure-pipelines.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,30 +47,30 @@ The following is a guide for setting up an Azure Pipelines release that automate
4747

4848
1. Add an Azure Resource Manager Deployment task:
4949

50-
a. In the stage view, select **View stage tasks**.
50+
1. In the stage view, select **View stage tasks**.
5151

52-
:::image type="content" source="media/continuous-integration-delivery/continuous-integration-image14.png" alt-text="Stage view":::
52+
:::image type="content" source="media/continuous-integration-delivery/continuous-integration-image14.png" alt-text="Stage view":::
5353

54-
b. Create a new task. Search for **ARM Template Deployment**, and then select **Add**.
54+
1. Create a new task. Search for **ARM Template Deployment**, and then select **Add**.
5555

56-
c. In the Deployment task, select the subscription, resource group, and location for the target data factory. Provide credentials if necessary.
56+
1. In the Deployment task, select the subscription, resource group, and location for the target data factory. Provide credentials if necessary.
5757

58-
d. In the **Action** list, select **Create or update resource group**.
58+
1. In the **Action** list, select **Create or update resource group**.
5959

60-
e. Select the ellipsis button (****) next to the **Template** box. Browse for the Azure Resource Manager template that is generated in your publish branch of the configured git repository. Look for the file `ARMTemplateForFactory.json` in the <FactoryName> folder of the adf_publish branch.
60+
1. Select the ellipsis button (****) next to the **Template** box. Browse for the Azure Resource Manager template that is generated in your publish branch of the configured git repository. Look for the file `ARMTemplateForFactory.json` in the <FactoryName> folder of the adf_publish branch. For more details about using linked ARM templates, see [Deploying linked ARM templates with VSTS](/archive/blogs/najib/deploying-linked-arm-templates-with-vsts) and [Using linked templates](continuous-integration-delivery-linked-templates.md#using-linked-templates).
6161

62-
f. Select **** next to the **Template parameters** box to choose the parameters file. Look for the file `ARMTemplateParametersForFactory.json` in the >FactoryName< folder of the adf_publish branch.
62+
1. Select **** next to the **Template parameters** box to choose the parameters file. Look for the file `ARMTemplateParametersForFactory.json` in the >FactoryName< folder of the adf_publish branch.
6363

64-
g. Select **** next to the **Override template parameters** box, and enter the desired parameter values for the target data factory. For credentials that come from Azure Key Vault, enter the secret's name between double quotation marks. For example, if the secret's name is cred1, enter **"$(cred1)"** for this value.
64+
1. Select **** next to the **Override template parameters** box, and enter the desired parameter values for the target data factory. For credentials that come from Azure Key Vault, enter the secret's name between double quotation marks. For example, if the secret's name is cred1, enter **"$(cred1)"** for this value.
6565

66-
h. Select **Incremental** for the **Deployment mode**.
66+
1. Select **Incremental** for the **Deployment mode**.
6767

68-
> [!WARNING]
69-
> In Complete deployment mode, resources that exist in the resource group but aren't specified in the new Resource Manager template will be **deleted**. For more information, please refer to [Azure Resource Manager Deployment Modes](../azure-resource-manager/templates/deployment-modes.md)
68+
> [!WARNING]
69+
> In Complete deployment mode, resources that exist in the resource group but aren't specified in the new Resource Manager template will be **deleted**. For more information, please refer to [Azure Resource Manager Deployment Modes](../azure-resource-manager/templates/deployment-modes.md)
7070
71-
:::image type="content" source="media/continuous-integration-delivery/continuous-integration-image9.png" alt-text="Data Factory Prod Deployment":::
71+
:::image type="content" source="media/continuous-integration-delivery/continuous-integration-image9.png" alt-text="Data Factory Prod Deployment":::
7272

73-
1. Save the release pipeline.
73+
1. Save the release pipeline.
7474

7575
1. To trigger a release, select **Create release**. To automate the creation of releases, see [Azure DevOps release triggers](/azure/devops/pipelines/release/triggers)
7676

articles/data-factory/copy-activity-overview.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ The Copy activity is executed on an [integration runtime](concepts-integration-r
2727

2828
An integration runtime needs to be associated with each source and sink data store. For information about how the Copy activity determines which integration runtime to use, see [Determining which IR to use](concepts-integration-runtime.md#determining-which-ir-to-use).
2929

30+
> [!NOTE]
31+
> You cannot use more than one self-hosted integration runtime within the same Copy activity. The source and sink for the activity must be connected with the same self-hosted integration runtime.
32+
3033
To copy data from a source to a sink, the service that runs the Copy activity performs these steps:
3134

3235
1. Reads data from a source data store.

0 commit comments

Comments
 (0)