cmd-build: Conditionally change the packing structure of container-image #3532
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
When the previous build exists, use its packing structure otherwise container-encapsulate generates a new one
cgwalters
reviewed
Jul 17, 2023
| @@ -462,18 +469,35 @@ else | |||
| "--label=io.openshift.build.versions=machine-os=${buildid}" | |||
| ) | |||
| fi | |||
|
|
|||
| last_build_manifest=() | |||
| if rpm-ostree compose container-encapsulate --help |grep -q -e "--previous-build-manifest"; then | |||
There was a problem hiding this comment.
I think actually nowadays we can rely on having a new enough rpm-ostree here, so we could probably now drop this check.
| last_build_manifest=() | ||
| if rpm-ostree compose container-encapsulate --help |grep -q -e "--previous-build-manifest"; then | ||
| # Use the last stable release if buildfetch used | ||
| if [ -n "${PARENT_BUILD}" ] && [ -f "${parent_builddir}/${name}-${PARENT_BUILD}-ostree.${basearch}-manifest.json" ]; then |
There was a problem hiding this comment.
Let's host this [ -f test up to deduplicate? It could then actually replace the check above.
There was a problem hiding this comment.
Note that [ -f checks two different conditions. The first one for dir parent_builddir and the second for previous_builddir
|
I am stuck on a login loop on fedoraidp, which makes me unable to check if this successfully builds on the jenkins pipelines using the debug pod mentioned here: #3508 (comment) |
cgwalters
approved these changes
Jul 18, 2023
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.
Fixes: #3528
When the previous build exists, use its packing structure otherwise container-encapsulate generates a new one