Always perform a checkout during merge-branches #350
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ut during merge-branches I completed a TODO in #349 to just have merge-branches return the SHA from ls-remote if there are actually no merges to perform. But by skipping checkout, `make gae_version_name` is generating the name from whatever cached version of the repo it had from the last job. Remove this optimization so that, when the merge-branches job calls `make gae_version_name`, it is run against the correct git revision. Issue: https://khanacademy.atlassian.net/browse/INFRA-10737 Test plan: Replay existing merge-branches job that failed to report to buildmaster due to this issue. https://jenkins.khanacademy.org/job/deploy/job/merge-branches/326071/console Tested with replay: https://jenkins.khanacademy.org/job/deploy/job/merge-branches/326086/console As a result, buildmaster successfully kiced off a webapp-test: https://jenkins.khanacademy.org/job/deploy/job/webapp-test/308969/
jwbron
approved these changes
Aug 13, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary:
I completed a TODO in #349 to
just have
kaGit.mergeRevisionsreturn the SHA from ls-remote if thereare actually no merges to perform. But by skipping checkout,
make gae_version_nameis generating the name from whatevercached version of the repo it had from the last job. This is preventing
the prerequisite merge-branches from successfully reporting back to
buildmaster due to:
So, webapp-test is never kicked off for PRs.
https://khanacademy.slack.com/archives/C013ANU53LK/p1755118117498589
Remove this optimization so that, when the merge-branches job calls
make gae_version_name, it is run against the correct git revision.Once this is merged, I will replay all the merge-branches jobs that
failed to report to buildmaster due to this issue.
Issue: https://khanacademy.atlassian.net/browse/INFRA-10737
Test plan:
Replay existing merge-branches job that failed to report to buildmaster
due to this issue.
https://jenkins.khanacademy.org/job/deploy/job/merge-branches/326071/console
Tested with replay:
https://jenkins.khanacademy.org/job/deploy/job/merge-branches/326086/console
As a result, buildmaster successfully kiced off a webapp-test:
https://jenkins.khanacademy.org/job/deploy/job/webapp-test/308969/