[rhcos-4.12] backports for 9p issue and concurrency for extensions container #3187
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
We're investigating an error in this command and we need more context. (cherry picked from commit ee0ac59)
This is necessary so that the `tmp_builddir`s allocated are distinct per artifact run. Otherwise, running the two commands in parallel will stomp on each other as they try to use the same dir. `buildextend-metal` already does this, so we're missing `buildextend-extensions-container` and `buildextend-legacy-oscontainer`. I believe this is the reason why `buildextend-extensions-container` has been failing in the RHCOS pipeline. I avoided a larger cleanup here around enforcing `IMAGE_TYPE` (probably should be renamed to e.g. `ARTIFACT`) getting set in `prepare_build`. That requires more work because we should also make sure to consistently clean up the dir at the end. Right now, we're relying on the fact that the same dir gets cleaned and reused each time. We'll also need to backport this so I wanted to keep the changes minimal. (cherry picked from commit db1c001)
We should be able to get rid of the two codes `disable=` bits there if we just tell ShellCheck where to find `cmdlib.sh` as we do elsewhere. (cherry picked from commit f2cfb18)
9p being 9p, we're hitting ENOMEM when trying to read `platforms.json` in `install_grub_cfg()`. Yet, it works fine at the top of the file when we initially parse the kargs and GRUB cmds. So somehow initial reads do go through. Let's try to leverage this by doing an early copy of the file into the supermin filesystem and then do any further introspections from there. That way, we only access it over 9p once. Maybe fixes coreos#3180. (cherry picked from commit e867666)
auto-merge was automatically disabled
November 10, 2022 22:35
Rebase failed
|
@dustymabe This looks like it is targeting |
good catch. Fixed! |
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.
No description provided.