vendor containers/common@main

[vrothberg]

The IgnorePlatform options has been removed from the
LookupImageOptions in libimage to properly support multi-arch images.

Signed-off-by: Valentin Rothberg [email protected]

[vrothberg]

Merged in c/common and c/buildah. Ready from my side.

@containers/podman-maintainers PTAL

[mheon]

Restarted one test, LGTM

[vrothberg]

$GOSRC/$SCRIPT_BASE/setup_environment.sh
/tmp/scripts81855ad8681d0d86d1e91e00167939cb.sh: line 5: /var/tmp/go/src/github.com/containers/podman/./contrib/cirrus/setup_environment.sh: No such file or directory

2nd time in this PR. Really looks like a CI infra fart.

[vrothberg]

Argh... the buds tests need massaging. I'll be out on Monday.

@edsantiago, do you know what's going on? In case not, please don't bother and I'll take a look on Tuesday morning.

[edsantiago]

This is almost certainly fallout from containers/buildah#3292

TL;DR something changed in runc (I think?) and changed the debug log messages. The fix in the above PR seems to have fixed things for new-runc, but perhaps our podman CI systems are still using old-runc, and the fix breaks.

Solution: make a fix that handles both old-runc and new-runc. Or: bump up podman CI systems to use new-runc.

@cevich PTAL

[cevich]

Solution: make a fix that handles both old-runc and new-runc. Or: bump up podman CI systems to use new-runc.

and wait, there's more! I'm having trouble bringing in new images due to some deep/dark SELinux issue only Dan and Giuseppe are qualified to describe 😢

[cevich]

Update: Since the update here merged, maybe try rebasing and see if it helps?

[vrothberg]

Update: Since the update here merged, maybe try rebasing and see if it helps?

Thank you! Just rebased.

[vrothberg]

Still failing:

[+0766s] not ok 211 bud with --runtime and --runtime-flag
[+0766s] # (from function `expect_output' in file tests/helpers.bash, line 317,
[+0766s] #  in test file tests/bud.bats, line 2899)
[+0766s] #   `expect_output --substring "$flag_accepted_rx"' failed

[cevich]

I have those same new images for this repo, but it's failing horribly in CI 😢

[vrothberg]

@containers/podman-maintainers @rhatdan please merge me. This will unblock merging c/common and buildah but note that the bud tests is now skipped until the CI images have been updated.

[rhatdan]

/approve
/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhatdan, vrothberg

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:

• OWNERS [rhatdan,vrothberg]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment