Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Checked in code to some branch directly #1477

Merged
13 commits merged into from
Mar 27, 2021
Merged

Checked in code to some branch directly #1477

13 commits merged into from
Mar 27, 2021

Conversation

@azure-sdk
Copy link
Collaborator

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

@azure-sdk
Copy link
Collaborator

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

@azure-sdk
Copy link
Collaborator

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

@azure-sdk
Copy link
Collaborator

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

@weshaggard weshaggard requested a review from danieljurek March 11, 2021 22:49
@sima-zhu sima-zhu marked this pull request as ready for review March 11, 2021 23:37
@sima-zhu sima-zhu requested a review from a team as a code owner March 11, 2021 23:37
@danieljurek
Copy link
Member

Was chatting with @scbedd today about what the world would look like after we implement this change. We agreed that there is the potential for many releases at once to create merge conflicts (especially when simultaneously adding things to the same location in the same file many times concurrently. However, the git-branch-push.ps1 script handles this scenario with some tenacity.

The next release will be a good test of that retry loop. In cases where the push step fails despite the retry loop, simply re-running the job will likely result in success.

In the case of an Onboarding branch we have 2 pushes and a partial success (one push succeeds, other fails) may result in noop pushes in retries but git-push-changes.yml is already checking for those changes. In short: I think that scenario is covered as well.

Our advice to anyone who sees failures in the docs.ms release job should be "let us know that it's happening so we can make adjustments to the implementation logic, retry the job once and it should succeed"

@weshaggard
Copy link
Member

We agreed that there is the potential for many releases at once to create merge conflicts (especially when simultaneously adding things to the same location in the same file many times concurrently. However, the git-branch-push.ps1 script handles this scenario with some tenacity.

Do we really think there will be that many conflicts? There might be other changes but hopefully not in the same file. If there are a lot of changes to the same files we might need to see if we can find a way to potentially separate them in some way to avoid conflicts. The retry logic will help for concurrent pushes and some basic conflicts but if there are files touching lines next to each other in the same files this retry logic will start to fall apart.

@azure-sdk
Copy link
Collaborator

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

@sima-zhu
Copy link
Contributor Author

Do we really think there will be that many conflicts? There might be other changes but hopefully not in the same file. If there are a lot of changes to the same files we might need to see if we can find a way to potentially separate them in some way to avoid conflicts. The retry logic will help for concurrent pushes and some basic conflicts but if there are files touching lines next to each other in the same files this retry logic will start to fall apart.

Every release build has to touch the package.json file. We got conflicts even in PRs. I am also looking for the github API which can lock the branch when we checked in the changes. The next incoming push operation has to pull the latest before push

@weshaggard
Copy link
Member

I am also looking for the github API which can lock the branch when we checked in the changes.

There are no such locking that I'm aware of and even if there was I would avoid trying to use it. As long as the likelihood of 2 jobs publishing to that file at the exact same time is pretty low we might be OK. HOwever if we can figure out some way to format the package.json file so that no 2 edits would be on exactly the same adjacent lines (i.e. maybe we could have some spacing or formatting between the often edit lines) then the retry would still mostly work.

@azure-sdk
Copy link
Collaborator

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

@azure-sdk
Copy link
Collaborator

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

@azure-sdk
Copy link
Collaborator

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

@azure-sdk
Copy link
Collaborator

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

@azure-sdk
Copy link
Collaborator

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

@azure-sdk
Copy link
Collaborator

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

@sima-zhu sima-zhu requested a review from weshaggard March 26, 2021 19:44
@azure-sdk
Copy link
Collaborator

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

@azure-sdk
Copy link
Collaborator

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

sima-zhu and others added 3 commits March 26, 2021 14:18
@azure-sdk
Copy link
Collaborator

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

@azure-sdk
Copy link
Collaborator

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

@azure-sdk
Copy link
Collaborator

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

@ghost
Copy link

ghost commented Mar 27, 2021

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.

@ghost ghost merged commit ec887c9 into Azure:master Mar 27, 2021
@sima-zhu sima-zhu deleted the skip_pr branch March 27, 2021 00:32
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants