Add support to accept incomplete release files for S3 artifact upload#315
Add support to accept incomplete release files for S3 artifact upload#315NotTheEvilOne wants to merge 1 commit intomainfrom
Conversation
f7af29a to
70a33ba
Compare
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #315 +/- ##
==========================================
+ Coverage 91.69% 92.01% +0.31%
==========================================
Files 42 42
Lines 2132 2141 +9
==========================================
+ Hits 1955 1970 +15
+ Misses 177 171 -6 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
This will once again cause the same problems as in gardenlinux/gardenlinux#3824. i.e. when we publish from main with the current feature graph of main checked out, then this will wrongly parse the cname the way it would be interpreted under that graph. Not the way it was actually build. ProofThe following was run with Yet So the features set that was guessed and included in the singles meta data does NOT match what's actually in the image. Also in this case there is no need to fall back to any features directory parsing since this release file has everything it needs. As per the proposed spec in https://github.com/gardenlinux/gardenlinux/pull/4268/changes#diff-68c407bf61f5bd289c500f7e5d74da2cad07997626126f020d5eda350cd30bc9R51-R61 it contains all fields except those explicitly marked "informational only, not used in publishing". So it should NOT require a features directory at all. So instead of querying a features directory and incorrectly guessing the features from a cname that may have been build from a completely unrelated feature graph, we should just drop the following requirements when loading from a released file: python-gardenlinux-lib/src/gardenlinux/features/cname.py Lines 534 to 536 in 2d52501 And instead utilize the |
|
The assumption to use |
70a33ba to
406cf43
Compare
|
@nkraetzschmar: With the correct commit checked out you will receive: Furthermore this PR is able to handle the current state of 1592 (without an Note: release files are actually simulated for these tests. |
406cf43 to
c3bd51b
Compare
For the last release of 1592 the release file looks as follows: So I'm not sure what you mean by this. |
For Or with Which is technically correct, yes, but since we do NOT want to backport gardenlinux/gardenlinux#4253 into previous releases as this would change cnames mid release, this output is undesired here. That's why treating That way can can simultaneously have the nice new handling of there should only be one platform on main, while release branches continue to work and only require adjustments in the release branches themselves, not any compatibility hacks outside of them. |
|
Please see #316 for the intended input output characteristics that the S3 upload should have and adjust this PR to match that behaviour just properly integrated in the |
Signed-off-by: Tobias Wolf <wolf@b1-systems.de> On-behalf-of: SAP <tobias.wolf@sap.com>
c3bd51b to
453883f
Compare
What this PR does / why we need it:
This PR adds support to accept incomplete release files for S3 artifact upload. It falls back to the
featuresdirectory to parse for remaining metadata.