Skip to content
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

Use packaged bats in Fedora, side-load for Ubuntu #140

Merged
merged 2 commits into from
Jun 30, 2022

Conversation

cevich
Copy link
Member

@cevich cevich commented Jun 22, 2022

Fixes #139

N/B: Using these images requires an update to the podman repo. to remove
the bats installer script and Makefile target.

@cevich cevich requested a review from edsantiago June 22, 2022 19:22
@cevich
Copy link
Member Author

cevich commented Jun 22, 2022

Crossing my fingers and hoping this works (it may be slightly over-complicated) 😜

@cevich
Copy link
Member Author

cevich commented Jun 22, 2022

okay ya, this is way too complex of a change (even though it appears to be working). I'm going to push up a vastly simpler version once these images finish building.

Copy link
Member

@edsantiago edsantiago left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, you're right, that was a lot more than I'd expected :)

Two concerns (not blockers, but more than nits). And a caveat that much of this (the gce.yml) is way above my head. But, yeah, LGTM. Thanks for the quick work.

cache_images/podman_tooling.sh Outdated Show resolved Hide resolved
podman/Containerfile Outdated Show resolved Hide resolved
@cevich cevich force-pushed the fix_bats_environments branch from 641d05a to c619511 Compare June 22, 2022 20:18
@cevich
Copy link
Member Author

cevich commented Jun 22, 2022

And a caveat that much of this (the gce.yml) is way above my head.

I've stripped that out and vastly simplified things. Then I went and screwed up again by including a commit I should just make a separate PR for. Sigh...there's always time for another try...

@cevich cevich force-pushed the fix_bats_environments branch from c619511 to a18a32e Compare June 22, 2022 20:50
@cevich
Copy link
Member Author

cevich commented Jun 22, 2022

...alright, fingers crossed.

@cevich
Copy link
Member Author

cevich commented Jun 22, 2022

First-in example of this working (container-build): https://cirrus-ci.com/task/6558019998711808?logs=main#L2496

Farther down the logs the one from podman VERSION=v1.1.0 ./hack/install_bats.sh is still there, but it's not installing and the correct version is there:

$ podman run -it --rm quay.io/libpod/ubuntu_podman:c4754986352508928 /usr/local/bin/bats --version
Trying to pull quay.io/libpod/ubuntu_podman:c4754986352508928...
Getting image source signatures
Copying blob 4950e1234d6c skipped: already exists
Copying blob f068b93481f7 done
Copying blob f840fb16d6d4 done
Copying blob a42b23c7aa70 done
Copying blob 9ee87b27525b done
Copying blob ea43d8fd23a0 done
Copying blob c050f98978f2 done
Copying blob 51963d3cee49 done
Copying config 9fe095a01d done
Writing manifest to image destination
Storing signatures
Bats 1.7.0

I expect to get the same result when the VM builds happen.

@cevich
Copy link
Member Author

cevich commented Jun 23, 2022

The 'ubuntu Cache Image' build failure seems to be an upstream problem:

    ubuntu:  libsystemd-dev : Depends: libsystemd0 (= 249.11-0ubuntu3) but 249.11-0ubuntu3.3 is to be installed
    ubuntu:  libudev-dev : Depends: libudev1 (= 249.11-0ubuntu3) but 249.11-0ubuntu3.3 is to be installed

At least for libsystemd-dev, it's reported here. I'm assuming once this is fixed, the libudev1 package will get fixed as well.

@github-actions
Copy link

Cirrus CI build successful. Image ID c4514861978746880 ready for use.

@edsantiago
Copy link
Member

Passed on re-run. I still haven't done a final review, but in my first passes (on earlier revisions) all seemed fine.

@cevich
Copy link
Member Author

cevich commented Jun 23, 2022

Passed on re-run.

Oh, thanks a bunch for re-running that! So it was def. a hangup in the upstream repos. Anyway, no rush to review, I can get a PR going in podman to test the new image (and remove the install_bats.sh) with this one still open. But I fully expect that PR to fail, since I think Lokesh's previous image-update PR is still running into problems. But we can at least make sure bats is found and starts up...

@cevich
Copy link
Member Author

cevich commented Jun 23, 2022

Podman PR: containers/podman#14719

cevich added a commit to cevich/buildah that referenced this pull request Jun 23, 2022
@cevich
Copy link
Member Author

cevich commented Jun 23, 2022

Buildah PR: containers/buildah#4074

@cevich
Copy link
Member Author

cevich commented Jun 29, 2022

Rebuilding images due to problems with podman package in Ubuntu.

cevich added 2 commits June 29, 2022 11:06
Fixes containers#139

N/B: Using these images requires an update to the podman repo. to remove
the bats installer script and `Makefile` target.

Signed-off-by: Chris Evich <[email protected]>
@github-actions
Copy link

Cirrus CI build successful. Image ID c5061352396947456 ready for use.

cevich added a commit to cevich/buildah that referenced this pull request Jun 29, 2022
@cevich cevich merged commit e856225 into containers:main Jun 30, 2022
cevich added a commit to cevich/buildah that referenced this pull request Jul 15, 2022
cevich added a commit to cevich/buildah that referenced this pull request Jul 20, 2022
cevich added a commit to cevich/buildah that referenced this pull request Jul 20, 2022
cevich added a commit to cevich/buildah that referenced this pull request Jul 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

install bats directly into the VM images
2 participants