cosalib: fix azure and required meta-data #1060
Merged
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
For RHCOS we are trying to make use of `-` as a version character in order to be semver-compatible. See openshift/oc#209 (comment)
|
Pending testing, but putting this out here early. |
cgwalters
reviewed
Jan 16, 2020
| # RHCOS wants to be semver-compatible, but Koji doesn't | ||
| # accept `-`. See | ||
| # https://github.com/openshift/oc/pull/209#issuecomment-564876535 | ||
| "version": f"{self.build.build_id.replace('-', '.')}" |
There was a problem hiding this comment.
Needed to fold in this PR versus keep in #1053 ?
There was a problem hiding this comment.
I wanted to test the code path. It was easier to include this commit in the pipeline for testing.
|
Okay, ready for review. This uploaded to both Koji and Azure. I'm doing a full test (all clouds, etc). Before merging, I'll have a triple check on the |
ashcrow
approved these changes
Jan 16, 2020
jlebon
approved these changes
Jan 16, 2020
added 4 commits
January 16, 2020 11:09
cosalib._Build was born because the need for commitmeta.json, archiving
COSA itself, and understanding COSA. However, it is the only _Build
derivative the requires that level of understanding. This change adds
kwargs of 'require_cosa' and 'require_commit'.
cmd-koji-upload: instantiate cosalib._Build with constructor kwargs of
with require_{cosa,commit}=True
More refactoring fall out: this adds back in the ability to upload Azure artifacts.
jcajka
pushed a commit
to jcajka/coreos-assembler
that referenced
this pull request
Mar 24, 2020
gcp: Add UEFI_COMPATIBLE and SECURE_BOOT
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.
This fixes two problems:
orecommand.coreos-assembler aws-replicatenows wantscommitmeta.json#1049: for RHCOS builds the commitmeta.json is present, however, only Koji uploads generally require it. This changes thecosalib.build._Buildto have conditional checks on the required artifacts needed to parse the meta-data.