Add new release branch script for copying task definition pipeline#1404
Merged
Conversation
It's not obvious what the naming convention is, so let's make it harder to get it wrong.
It's not that hard to diff files across branches, so let's not keep the unused pipeline definitions. Includes showing some vimdiff command lines to do the comparison across branches.
Not sure why it didn't happen before, but we patches double applied if the merge commit is included.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1404 +/- ##
==========================================
+ Coverage 79.59% 86.82% +7.22%
==========================================
Files 62 73 +11
Lines 4347 4682 +335
==========================================
+ Hits 3460 4065 +605
+ Misses 887 617 -270
Flags with carried forward coverage won't be shown. Click here to find out more. |
simonbaird
force-pushed
the
more-release-branch-scripts
branch
2 times, most recently
from
0734cff to
59fc8ca
Compare
simonbaird
changed the title
Member
Author
|
I think it's working as expected. Moving out of draft. There's a little bit more work needed to tell the user how to create the component, but I'm thinking to do that in another PR. |
simonbaird
force-pushed
the
more-release-branch-scripts
branch
2 times, most recently
from
6b64da5 to
35236f7
Compare
The new task bundle Konflux pipeline is not generated initially by Konflux. Instead it was created manually (IIUC using Kustomize with the template in the build-definitions repo, ask Joe for the details if you want to know more). So to create it in the release branch we can just copy it from main branch and make a few adjustments to ensure it is linked to the correct Konflux component. https://issues.redhat.com/browse/EC-428 https://issues.redhat.com/browse/EC-472
With the <(...) command line there's no file extension so the vim syntax highlighting doesn't work. We can't have that.
simonbaird
force-pushed
the
more-release-branch-scripts
branch
from
35236f7 to
66f051d
Compare
joejstuart
reviewed
Mar 7, 2024
| Review the generated commit, and inspect the diff as described. | ||
|
|
||
| # Copy the task definition pipeline from main branch | ||
| hack/copy-task-release-pipelines.sh |
Contributor
There was a problem hiding this comment.
nit: any reason to not have this code in the patch-release-pipelines script?
Member
Author
There was a problem hiding this comment.
Hmm, yeah I did consider that. There is more code in common than I originally thought. Still my feeling is that two short hacky scripts is better than one long one. Maybe we can put them together in future.
joejstuart
approved these changes
Mar 7, 2024
Member
Author
|
Let's merge - I want to redo the release branch with this. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Also includes some improvements for the existing script for patching the cli pipeline.