-
Notifications
You must be signed in to change notification settings - Fork 2.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
DO NOT MERGE: buildah vendor treadmill #13808
base: main
Are you sure you want to change the base?
Conversation
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: edsantiago The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
The first commit is the important one. This one must be hand-crafted by a human, there is no possible way to automate it. This is the one that, in case of emergency vendor, can be grabbed into a real PR. The second commit is a throwaway, ignore it. That's just automated fetch-the-latest-buildah. |
cda56d1
to
a833f6d
Compare
bud test failed, remote only, because the new This is still a proof-of-concept PR, and my feeling so far is positive: it has quickly identified multiple problems in the buildah merge that are easy to solve iteratively. A nightly cron job, or a non-gating step in buildah CI, would be utterly useless because neither one would have the crucial first-commit. Without that, there's no way to make it past the first or second or third failure. |
I just pushed a fix for this. |
4c3987c
to
a58b300
Compare
How is this PR regularly updated? |
By a human, presumably me. There is actually no other way: this is not possible to solve via cron or PRs. I am working on a script to automate as much of it as possible. |
a58b300
to
2ee7d5b
Compare
2ee7d5b
to
a44108d
Compare
a44108d
to
c9c4a1f
Compare
Followup, because I don't want anyone to think this is abandonware: it's not. I'm running my script at least twice a day, one of those times in the evening. One of the nice features I added is:
So I'm choosing to save CI cycles by not re-pushing today. Should anyone need to re-vendor buildah tomorrow or this weekend (when I'm unavailable), just cherry-pick the first commit from this PR. It's still valid. |
c9c4a1f
to
2954d4f
Compare
Yippee, script has caught a bug! containers/buildah#3919 breaks when vendoring into podman:
I could just force-push right now and let y'all see the breakage in CI, or I could just report it like I am right here. Or I could file an issue in containers/common since that's where the offending code seems to be? Anyhow, @rhatdan et al, PTAL because this is not going to vendor into podman. |
2954d4f
to
3bf05d3
Compare
What the heck, I pushed anyway in case someone wants to pull & play. |
772b92e
to
7e1e7f4
Compare
7e1e7f4
to
e5ff38e
Compare
We were not able to find or create Copr project
Unless the HTTP status code above is >= 500, please check your configuration for:
|
Ephemeral COPR build failed. @containers/packit-build please check. |
This commit was automatically cherry-picked by buildah-vendor-treadmill v0.3 from the buildah vendor treadmill PR, containers#13808 * Fix conflict caused by Ed's local-registry PR in buildah * Wire in "new" --retry and --retry-delay, these existed for longer but where non functional. Signed-off-by: Ed Santiago <[email protected]> Signed-off-by: Paul Holzinger <[email protected]>
cedb9d9
to
43af95e
Compare
6011906
to
471b6c1
Compare
4d35d1a
to
c02ccd4
Compare
Gah. I completely forgot about One possible solution will be to use a custom socket for each process, maybe derived from Good news is, though, THIS EFFORT IS WORTH IT! (parallelizing). Wow, 15 minutes for bud tests. |
247d9e5
to
795879c
Compare
*sniffle*. Look at this. Passing bud tests, all in less than sixteen minutes. (For comparison: bud tests are by far our biggest slowdown, taking ~35 minutes on a CI run). My changes here are absolutely not ready for prime time, but I think they're in good enough shape that someone else should be able to carry them through without much fuss. |
This is a JUNK COMMIT from buildah-vendor-treadmill v0.3. DO NOT MERGE! This is just a way to keep the buildah-podman vendoring in sync. Refer to: https://github.com/containers/podman/wiki/Buildah-Vendor-Treadmill Signed-off-by: Ed Santiago <[email protected]>
I was counting on the parallel work to get this time down.
Just to be clear we need to get the parallel test going in buildah first? Once that works we can enable it here for bud tests?! |
795879c
to
b1fe18e
Compare
I believe so, yes. For context, that work is in containers/buildah#5552 but there's a weird flake that is blocking it. I am very curious to find out if we hit that flake here in podman testing. I'll keep re-pushing this PR today. On second thought, it might be worth thinking about pushing this into podman even before the buildah-parallel flake is fixed. Maybe by skipping the function run_buildah() {
if arg is "build" or "bud" or "build-using-dockerfile"; then
use podman build instead
else
invoke buildah directly
fi
} Maybe I should just submit a PR and force-merge it. That way all the nice kind wonderful touching things y'all have said about me will poof, vanish into thin air and be replaced by yells of anger.... |
As you run --sync, please update this commit message with your actual changes. Changes since 2024-11-14: * EXPERIMENTAL: try running in parallel on fastvm * line-offset-only changes to helpers.bash diffs, due to new _prefetch() * SUPER-EXPERIMENTAL AND POSSIBLY BROKEN: add parallelization mechanism to podman-remote tests. Signed-off-by: Ed Santiago <[email protected]>
b1fe18e
to
9893ae9
Compare
Followup to Cabal discussion 2022-04-07, re: letting us vendor in buildah on a moment's notice.
Instead of cron'ing this, let's see if this works: keep this PR open perpetually, with daily updates to get latest podman and buildah.
See individual commit messages for details.