This repository has been archived by the owner on Oct 10, 2020. It is now read-only.
syscontainers: read labels from v1Compatibility #1170
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
| @@ -1646,7 +1646,13 @@ def _inspect_system_branch(self, repo, imagebranch): | |||
| virtual_size = self._get_virtual_size(repo, manifest) | |||
| if 'Labels' in manifest: | |||
| labels = manifest['Labels'] | |||
| else: | |||
| elif 'history' in manifest: | |||
There was a problem hiding this comment.
Might be time to educate Tom, but should this be an if rather than an elif?
There was a problem hiding this comment.
no, I'd like to take this branch only if the first 'if' was not satisfied.
If the labels are found in manifest['Labels'] we don't need to look into 'history'.
There was a problem hiding this comment.
@giuseppe Thanks for the info. FYI some of the tests aren't looking happy.
There was a problem hiding this comment.
it is because of storage :( it is failing since long time but it should not be related to this PR
giuseppe
force-pushed
the
atomic-read-labels-fromv1Compatibility-block
branch
2 times, most recently
from
a89af7b to
46d4fa1
Compare
|
📌 Commit 46d4fa1 has been approved by |
rh-atomic-bot
pushed a commit
that referenced
this pull request
Feb 1, 2018
Images coming from registry.access.redhat.com through "skopeo copy" have this information in the v1Compatibility block. Use this information so we can correctly catch "atomic.run". Signed-off-by: Giuseppe Scrivano <[email protected]> Closes: #1170 Approved by: baude
|
@rh-atomic-bot retry |
rh-atomic-bot
pushed a commit
that referenced
this pull request
Feb 1, 2018
Images coming from registry.access.redhat.com through "skopeo copy" have this information in the v1Compatibility block. Use this information so we can correctly catch "atomic.run". Signed-off-by: Giuseppe Scrivano <[email protected]> Closes: #1170 Approved by: baude
Images coming from registry.access.redhat.com through "skopeo copy" have this information in the "v1Compatibility" block. Use this information so we can correctly catch "atomic.run". Signed-off-by: Giuseppe Scrivano <[email protected]>
giuseppe
force-pushed
the
atomic-read-labels-fromv1Compatibility-block
branch
from
46d4fa1 to
12edeeb
Compare
|
bot, retest this please |
|
@rh-atomic-bot r=baude 12edeeb |
rh-atomic-bot
pushed a commit
that referenced
this pull request
Feb 1, 2018
Images coming from registry.access.redhat.com through "skopeo copy" have this information in the "v1Compatibility" block. Use this information so we can correctly catch "atomic.run". Signed-off-by: Giuseppe Scrivano <[email protected]> Closes: #1170 Approved by: baude
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Images coming from registry.access.redhat.com through "skopeo copy"
have this information in the v1Compatibility block. Use this
information so we can correctly catch "atomic.run".
Signed-off-by: Giuseppe Scrivano [email protected]