Add pipeline configuration for cleaning up upstream branches #1088

chidozieononiwu · 2020-10-12T17:19:07Z

Add Cleanup pipeline.
The intention is to run this on a schedule. The first step here is for cleaning up eng sommon sync branches.

chidozieononiwu · 2020-10-12T18:14:03Z

/azp run azure-sdk-tools - sync - eng-common

azure-pipelines · 2020-10-12T18:14:10Z

No pipelines are associated with this pull request.

chidozieononiwu · 2020-10-12T18:17:43Z

/azp run azure-sdk-tools - sync - eng-common

azure-pipelines · 2020-10-12T18:17:53Z

Azure Pipelines successfully started running 1 pipeline(s).

azure-sdk · 2020-10-12T18:26:31Z

The following pipelines have been queued for testing:
java - template
js - template
net - template
python - template
Sign off on the approval gate to test the release stage of each pipeline.

azure-sdk · 2020-10-12T18:46:23Z

The following pipelines have been queued for testing:
java - template
js - template
net - template
python - template
Sign off on the approval gate to test the release stage of each pipeline.

eng/common/scripts/Delete-RemoteBranches.ps1

weshaggard · 2020-10-12T19:33:22Z

eng/pipelines/templates/jobs/tools-cleanup.yml

+            workingDirectory: $(System.DefaultWorkingDirectory)
+            filePath: $(System.DefaultWorkingDirectory)/eng/common/scripts/Delete-RemoteBranches.ps1
+            arguments: >
+              -RepoName ${{ repo }}


Looks like you are not passing RepoOwner. I assume you plan to pass azure-sdk as these are cleaning up branches in the forks.

We should also consider doing a similar branch clean-up for the increment version branches.

Actually , This is for cleaning up upstream branches pushed to the main repos as part of the new process. So RepoOwner is azure. I was defaulting it in the script earlier.

Do we need to do cleanup on the 'azure-sdk' owned repos?

weshaggard

Add a couple comments but looks good overall.

eng/common/scripts/Delete-RemoteBranches.ps1

- Refactor GitHub API call to allow reusability. - Add Clean up pipeline with step that deletes upstream sync branches . Moved to #1088 - Add auto-merge label to Sync and Tools PRs - Remove the Verify and Merge stage.

azure-sdk · 2020-10-13T01:55:07Z

The following pipelines have been queued for testing:
java - template
js - template
net - template
python - template
You can sign off on the approval gate to test the release stage of each pipeline.
See eng/common workflow

eng/common/scripts/Delete-RemoteBranches.ps1

mitchdenny

Just an open question about whether we need to delete the pull request as well, but other than that looks good.

azure-sdk · 2020-10-13T17:50:05Z

The following pipelines have been queued for testing:
java - template
js - template
net - template
python - template
You can sign off on the approval gate to test the release stage of each pipeline.
See eng/common workflow

Sync eng/common directory with azure-sdk-tools for PR Azure/azure-sdk-tools#1088 See [eng/common workflow](https://github.com/Azure/azure-sdk-tools/blob/master/eng/common/README.md#workflow)

ghost · 2020-10-14T04:51:02Z

Hello @azure-sdk!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn more here.

weshaggard · 2020-10-14T19:27:30Z

@chidozieononiwu one side-effect of using the auto-merge tag we end up loosing some of the commit history when we it squashes and merges. See Azure/azure-sdk-for-c@639007a which is the auto-merged commit for Azure/azure-sdk-for-c#1426 and compare that to the manually merged commit Azure/azure-sdk-for-python#14482 for Azure/azure-sdk-for-python#14482.

The auto-merge will use the issue description as the commit message which is by design. So I guess we should decided if that is OK for our workflow or not. On one hand I kind of like it because it has a direct link to the tools PR but on the other we do lose the commit messages from the tools changes which does force people to always click through to the tools PR.

@mitchdenny what is your thoughts on what should happen here?

weshaggard · 2020-10-14T19:30:53Z

eng/common/scripts/Invoke-GitHubAPI.ps1

+Ref to search for
+Pass 'heads/<branchame> ,tags/<tag name>, or nothing
+#>
+function List-References {


I think we should have a better name for this function as List-References without context is hard to understand as it is very ambiguous with other things. For example reference means something in PS as well. Perhaps List-GithubSourceReferences or something like that might be a little clearer.

weshaggard · 2020-10-14T19:31:21Z

eng/common/scripts/Invoke-GitHubAPI.ps1

+    $RepoOwner,
+    [Parameter(Mandatory = $true)]
+    $RepoName,
+    $Ref


At some point we might also need to pass a token here if we ever call this on a private repo for example.

weshaggard · 2020-10-14T19:31:57Z

eng/common/scripts/Invoke-GitHubAPI.ps1

@@ -229,4 +268,27 @@ function Update-Issue {
  }

  return Invoke-GitHubAPIPatch -apiURI $uri -body $parameters -token $AuthToken
+}
+
+function Delete-References {


Perhaps a better name would be Delete-GithubSourceReference.

weshaggard · 2020-10-14T19:36:12Z

eng/common/scripts/Delete-RemoteBranches.ps1

+    exit 1
+  }
+
+  if ($pullRequests.Count -eq 0)


Should we log cases where we find branches that have a pull request and list the branch and what open pull requests there are still for it?

- Refactor GitHub API call to allow reusability. - Add Clean up pipeline with step that deletes upstream sync branches . Moved to #1088 - Add auto-merge label to Sync and Tools PRs - Remove the Verify and Merge stage.

- Add Cleanup pipeline. - The intention is to run this on a schedule. The first step here is for cleaning up `eng sommon sync` branches.

Sync eng/common directory with azure-sdk-tools for PR Azure/azure-sdk-tools#1088 See [eng/common workflow](https://github.com/Azure/azure-sdk-tools/blob/master/eng/common/README.md#workflow)

chidozieononiwu requested a review from a team as a code owner October 12, 2020 17:19

chidozieononiwu mentioned this pull request Oct 12, 2020

Eng Common Sync Improvements. #1081

Merged

chidozieononiwu requested a review from weshaggard October 12, 2020 17:20

weshaggard reviewed Oct 12, 2020

View reviewed changes

eng/common/scripts/Delete-RemoteBranches.ps1 Outdated Show resolved Hide resolved

weshaggard reviewed Oct 12, 2020

View reviewed changes

weshaggard approved these changes Oct 12, 2020

View reviewed changes

mitchdenny reviewed Oct 12, 2020

View reviewed changes

eng/common/scripts/Delete-RemoteBranches.ps1 Outdated Show resolved Hide resolved

chidozieononiwu added 3 commits October 12, 2020 18:41

Add pipeline configuration for cleaning up upstream branches

9fc895c

Fix powershell naming

7835581

Switch to use github API

e7f4560

chidozieononiwu force-pushed the feature/AddCleanUPPipeline branch from fafc7d7 to be7fbd5 Compare October 13, 2020 01:45

mitchdenny reviewed Oct 13, 2020

View reviewed changes

eng/common/scripts/Delete-RemoteBranches.ps1 Show resolved Hide resolved

mitchdenny approved these changes Oct 13, 2020

View reviewed changes

Use github API to delete branches

66a2e8b

chidozieononiwu force-pushed the feature/AddCleanUPPipeline branch from be7fbd5 to 66a2e8b Compare October 13, 2020 17:34

chidozieononiwu added Central-EngSys This issue is owned by the Engineering System team. EngSys This issue is impacting the engineering system. labels Oct 13, 2020

chidozieononiwu assigned chidozieononiwu and danieljurek and unassigned danieljurek and chidozieononiwu Oct 13, 2020

chidozieononiwu removed Central-EngSys This issue is owned by the Engineering System team. EngSys This issue is impacting the engineering system. labels Oct 13, 2020

chidozieononiwu self-assigned this Oct 13, 2020

azure-sdk added the auto-merge label Oct 14, 2020

ghost merged commit b93718e into Azure:master Oct 14, 2020

weshaggard reviewed Oct 14, 2020

View reviewed changes

benbp pushed a commit that referenced this pull request Dec 1, 2020

Add pipeline configuration for cleaning up upstream branches (#1088)

edf1b48

- Add Cleanup pipeline. - The intention is to run this on a schedule. The first step here is for cleaning up `eng sommon sync` branches.

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add pipeline configuration for cleaning up upstream branches #1088

Add pipeline configuration for cleaning up upstream branches #1088

chidozieononiwu commented Oct 12, 2020

chidozieononiwu commented Oct 12, 2020

azure-pipelines bot commented Oct 12, 2020

chidozieononiwu commented Oct 12, 2020

azure-pipelines bot commented Oct 12, 2020

azure-sdk commented Oct 12, 2020

azure-sdk commented Oct 12, 2020

weshaggard Oct 12, 2020

chidozieononiwu Oct 13, 2020

weshaggard left a comment •

edited

Loading

azure-sdk commented Oct 13, 2020

mitchdenny left a comment

azure-sdk commented Oct 13, 2020

ghost commented Oct 14, 2020

weshaggard commented Oct 14, 2020

weshaggard Oct 14, 2020

weshaggard Oct 14, 2020

weshaggard Oct 14, 2020

weshaggard Oct 14, 2020

Add pipeline configuration for cleaning up upstream branches #1088

Add pipeline configuration for cleaning up upstream branches #1088

Conversation

chidozieononiwu commented Oct 12, 2020

chidozieononiwu commented Oct 12, 2020

azure-pipelines bot commented Oct 12, 2020

chidozieononiwu commented Oct 12, 2020

azure-pipelines bot commented Oct 12, 2020

azure-sdk commented Oct 12, 2020

azure-sdk commented Oct 12, 2020

weshaggard Oct 12, 2020

Choose a reason for hiding this comment

chidozieononiwu Oct 13, 2020

Choose a reason for hiding this comment

weshaggard left a comment • edited Loading

Choose a reason for hiding this comment

azure-sdk commented Oct 13, 2020

mitchdenny left a comment

Choose a reason for hiding this comment

azure-sdk commented Oct 13, 2020

ghost commented Oct 14, 2020

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

weshaggard commented Oct 14, 2020

weshaggard Oct 14, 2020

Choose a reason for hiding this comment

weshaggard Oct 14, 2020

Choose a reason for hiding this comment

weshaggard Oct 14, 2020

Choose a reason for hiding this comment

weshaggard Oct 14, 2020

Choose a reason for hiding this comment

weshaggard left a comment •

edited

Loading

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn more here.