ADF devops deployment and version management

Question

ADF devops deployment and version management

Nagesh CL 706

Hi Team,
Need few clarifications about ADF DevOps deployment: -

DevOps deployment for ADF relies on adf_publish branch. adf_publish branch can be updated only by the collaboration branch.
Once the project goes live, we have the finalised code in one of the GIT branches (Lets assume "Release/R1").
Post go-live, we would be working on both prod maintenance which requires frequent deployments and future releases (Like R2, R3) which may happen once in 2 months or 3 months.
Here comes the challenges, since we cannot deploy changes to higher environments from any branch we desire, how do we merge changes to collaboration branch and further to publish branch.

For Ex - Bug fixes and new release enhancements are going in parallel. Then for deploying the changes to higher environments, how can we selectively choose which branch (Bug fix or enhancements branch) the code should be deployed from?

0 comments

1 answer

Your answer

Answer 1

AnnuKumari-MSFT 34,571 Microsoft Employee Moderator

Hi @Nagesh CL ,

Thankyou for using Microsoft Q&A platform and thanks for posting your question.

As I understand your ask , you want to get clarity on how to perform deployment in ADF . I will try to help you on that.

Continuous integration is the practice of integrating all your code changes into the main branch of a shared source code repository early and often, testing each change when you commit or merge them, and immediately kicking off a build.

Whenever there is any enhancement in the existing pipeline or any new bug fix which is tested in Dev after being worked upon in local branch, the next step should be to create a brand new local branch and import the newly created and tested pipeline in the new local branch and give a pull request to the collaboration branch in order to merge the changes . Once the new changes are published, adf_publish branch will have the updated ARM template that can be utilized for the release.

So, basically, once the code or fix is implemented and tested in local branch, it should be merged into the main branch via Pull request from a new branch.

You can download the support file of the pipeline and upload the same in the new local branch GIT repo to have it in the new local branch from where you need to raise the Pull request.

Kindly refer to this thread for more details.

Hope this will help. Please let us know if any further queries.

------------------------------

Please don't forget to click on or upvote button whenever the information provided helps you.
Original posters help the community find answers faster by identifying the correct answer. Here is how
Want a reminder to come back and check responses? Here is how to subscribe to a notification
If you are interested in joining the VM program and help shape the future of Q&A: Here is how you can be part of Q&A Volunteer Moderators

AnnuKumari-MSFT 34,571 Reputation points Microsoft Employee Moderator

2022-08-03T05:16:45.5+00:00

Hi @Nagesh CL ,
Just checking in to see if the above answer helped. Please do consider clicking Accept Answer and Up-Vote for the same as accepted answers help community as well. If you have any further query do let us know.
Nagesh CL 706 Reputation points

2022-08-17T12:07:52.427+00:00

@AnnuKumari-MSFT ,
Sorry for responding late and thanks for your response.

Please correct me if I am wrong here. ADF deployment using Azure DevOps completely relies on adf_publish branch? And adf_publish branch is updatable only by the Collaboration branch?

I have connected GIT to my ADF instance. So, as soon as I create a branch in ADF, I can see that branch in DevOps GIT. There is no local branch concept for ADF? Even if there is, adf_publish branch can be updated only by Collaboration branch and we cannot override the code in Collaboration branch with two different versions of code base?

Thanks.

Regards,
Nagesh CL
AnnuKumari-MSFT 34,571 Reputation points Microsoft Employee Moderator

2022-09-10T05:38:56.123+00:00

Hi @Nagesh CL ,

Apologies for delay in response. Yes your understanding is correct. Once we publish our changes, ARM template gets updated. The latest ARM template present in the adf_publish branch is taken for the deployment.

Coming to the questions:

"And adf_publish branch is updatable only by the Collaboration branch?" -- Once you raise the Pull request from local branch, and once it gets approved, your changes from the local branch would merge to the main branch or collaboration branch . The next step is to publish the changes by hitting the publish button on the top .

"There is no local branch concept for ADF? " -- Concept of local branch is there.
"we cannot override the code in Collaboration branch with two different versions of code base?" -- No it would create conflict. Always make sure you are raising Pull request from the newest local branch , once the changes are merged to the main branch, you can delete the local branch.

For more details, kindly go through this thread.

------------------

If the above answer helped, Please do consider clicking Accept Answer and Up-Vote for the same as accepted answers help community as well. If you have any further query do let us know.

Share via

ADF devops deployment and version management

1 answer

Your answer