ci-automation: Follow-up fix for 2-phase nightly SDK build tags #799
Conversation
This file contains 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
|
As GitHub Actions cannot run SDK builds yet, can you please start Jenkins SDK builds? |
|
Build action triggered: https://github.com/flatcar/scripts/actions/runs/6416606517 |
|
I discussed this with Thilo and will introduce a two-phase build flag to nightly builds job, so I can run it manually instead of waiting for Friday. |
|
Moved to backlog |
krnowak
force-pushed
the
krnowak/more-2-phase-tag-fixes
branch
from
a4bb2b9
to
5574f3d
Compare
We push a commit with the nightly SDK tag to the main branch if the SDK was built from the main branch. Which is what happens when we build the nightly intermediate SDK. The final nightly SDK is not built from the main branch, but rather from the nightly intermediate SDK tag. Both of them point to the exactly same commit, but the difference is in what `git rev-parse --abbrev-ref HEAD` returns for each of those. When the main branch is checked out, the command will return "main". When the nightly intermediate SDK tag is checked out, the command will return "HEAD". So when nightly final SDK is being built, the command returns a string different than "main" and thus decides not to push the commit with the final nightly SDK tag to the main branch. Rework it to assume that if `git rev-parse HEAD` and `git rev-parse origin/main` return the same commit hash (and it's the nightly build and all that) then the commit should be pushed. We use "origin/main" instead of just "main" just in case the main branch was not checked out before, for some reason (may come up in testing with different names for the main branch when testing).
Changing the name of the main branch and the name of the nightly tag may be useful for testing, so let's have them defined in one place.
krnowak
force-pushed
the
krnowak/more-2-phase-tag-fixes
branch
from
72f4e71
to
3440884
Compare
krnowak
had a problem deploying
to
development
GitHub Actions
Failure
|
Tested it with my branch krnowak/fake-main (where I actually skip building stuff and focus on the tagging issue) and with some jenkins modifications to avoid running irrelevant jobs. See: http://jenkins.infra.kinvolk.io:8080/job/container/job/nightly/429/cldsv/ |
dongsupark
approved these changes
Sep 29, 2023
pothos
added a commit
that referenced
this pull request
Oct 5, 2023
ci-automation: Follow-up fix for 2-phase nightly SDK build tags
pothos
added a commit
that referenced
this pull request
Oct 5, 2023
ci-automation: Follow-up fix for 2-phase nightly SDK build tags
pothos
added a commit
that referenced
this pull request
Oct 5, 2023
ci-automation: Follow-up fix for 2-phase nightly SDK build tags
pothos
added a commit
that referenced
this pull request
Oct 5, 2023
ci-automation: Follow-up fix for 2-phase nightly SDK build tags
|
Backported to all branches |
pothos
added a commit
to flatcar/flatcar-build-scripts
that referenced
this pull request
Oct 5, 2023
The tagging function was changed in the scripts repo with flatcar/scripts#799 (not on all branches but this is solved now) and since the tag-release script uses it we also have to adjust the function call here.
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.
We push a commit with the nightly SDK tag to the main branch if the SDK was built from the main branch. Which is what happens when we build the nightly intermediate SDK. The final nightly SDK is not built from the main branch, but rather from the nightly intermediate SDK tag. Both of them point to the exactly same commit, but the difference is in what
git rev-parse --abbrev-ref HEADreturns for each of those. When the main branch is checked out, the command will return "main". When the nightly intermediate SDK tag is checked out, the command will return "HEAD". So when nightly final SDK is being built, the command returns a string different than "main" and thus decides not to push the commit with the final nightly SDK tag to the main branch. Rework it to assume that ifgit rev-parse HEADandgit rev-parse mainreturn the same commit hash (and it's the nightly build and all that) then the commit should be pushed.