Commit Graph

395 Commits

Author SHA1 Message Date
Miloslav Trmač 3748cda03b Also run integration tests with the Sequoia backend
This extra test run is temporary; it should be removed after
rust-podman-sequoia makes it to a stable Fedora release.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-09-30 21:42:51 +02:00
Nalin Dahyabhai f8f398bb3c Run with --device /dev/fuse and not just -v /dev/fuse:/dev/fuse
When passing /dev/fuse to a container, use --device instead of a plain
volume mount.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-06-17 09:22:47 -04:00
Nalin Dahyabhai a9a9a43962 CI: pass $BUILDAH_RUNTIME through to in-container test runs
Pass BUILDAH_RUNTIME through to tests that we run inside of containers,
and discard the CI_DESIRED_RUNTIME variable, which sort of did the same
thing.  We still set OCI to the name of the runtime because tests
consult it directly.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-06-17 09:22:14 -04:00
Nalin Dahyabhai b97fd7d686 CI: ensure rootless groups aren't duplicates
When adding an unprivileged user to run tests as, ensure that the
primary and supplemental groups are not repeated, and that at least one
supplemental group is outside of the user's subgid range.  When skipping
a test because the invoking user doesn't have any supplemental groups,
log the user's IDs.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-06-17 09:18:47 -04:00
Nalin Dahyabhai 9ecc98e584 CI: give the rootless test user some supplemental groups
Exercise preservation of supplemental groups in the tests that use
`buildah build` and `buildah from` with `--group-add keep-groups`.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-06-13 10:32:33 -04:00
flouthoc 147a3ca916
.cirrus: run -race only on non-PR branch
Signed-off-by: flouthoc <flouthoc.git@gmail.com>
2025-02-05 06:57:14 -08:00
Nalin Dahyabhai 282cc38c39 `make lint`: use --timeout instead of --deadline
Updated linters use `--timeout` instead of `--deadline`.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2024-08-07 10:10:35 -04:00
Ed Santiago 3ad0fd1ed1 CI: use local registry, part 2 of 2
Make tests pass when using a local cache registry (as triggered
by $CI_USE_REGISTRY_CACHE being non-empty).

Mostly just change images: consolidate to a smaller set, like,
replace the few instances of debian with ubuntu, use $SAFEIMAGE
where we can.

The most significant change was with some s1 (schema 1?) images.
Those exist on quay, but cannot be mirrored locally: the local
registry forbids schema 1 images. I choose to skip these tests
when running against a local registry.

Second most significant change is running containerized tests
with --net=host. We need this to access the registry running
on a localhost port. (One alternative would be to bind the
registry on all interfaces, cringe, then perform sed magic
on the registries-cache.conf file changing 127.0.0.1 to
host.containers.internal, more cringe).

Also, some cleanup.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2024-07-17 12:26:49 -06:00
Ed Santiago 52df6e0e0f CI: use local registry, part 1 of 2
As of https://github.com/containers/automation_images/pull/357
our CI VMs include a local registry preloaded with all(*)
images used in tests.

 * where "all" means "most".

This commit defines a new registries-cached.conf, used in tests,
that redirects docker and quay to the new local registry. The
hope is that this will reduce CI flakes.

Since tests change over time, and new tests may require new
images, this commit also adds a mechanism for pulling in
remote images at test run time. Obviously this negates
the purpose of the cache, since it introduces a flake
pain point. The idea is: DO NOT DO THIS UNLESS ABSOLUTELY
NECESSARY, and then, if we have to do this, hurry up and
spin new CI VMs that include the new image(s).

Signed-off-by: Ed Santiago <santiago@redhat.com>
2024-07-17 12:09:54 -06:00
Nalin Dahyabhai 0569f3728a Cirrus: run `df` during job setup
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2024-06-07 11:32:12 -04:00
Chris Evich 1bc5dd6921
[CI:DOCS] Migrate buildah container image
Moved to: https://github.com/containers/image_build

Signed-off-by: Chris Evich <cevich@redhat.com>
2024-03-11 09:53:42 -04:00
Chris Evich fee7050811
Revert "Reduce official image size"
Fixes: #5349

Unanticipated missing `dnf` functionality likely negatively impacts a
significant number of image users.  Further exploration of size
reduction is needed, but we cannot (likely) swap to `microdnf` easily.

This reverts commit cdb1a4ff8e.

Signed-off-by: Chris Evich <cevich@redhat.com>
2024-02-21 15:03:52 -05:00
Ian Kerins cdb1a4ff8e Reduce official image size
Current image size is 728MB.

1. Switch to fedora-minimal. Requires switching to dnf5. shadow-utils is
no longer included in the base image, so the bits about it are renmoved.
728MB -> 650MB.
2. Don't update unrelated packages. 650MB -> 598MB.

Ultimately the image is still very large, which is driven by the
veritable constellation of dependencies buildah installs.  Installing
`buildah` in fedora-minimal gives you this plan:

```
Package                            Arch    Version              Repository      Size
Upgrading:
 alternatives                      aarch64 1.26-1.fc39          updates    218.2 KiB
  replacing alternatives           aarch64 1.25-1.fc39          <unknown>  218.2 KiB
 bash                              aarch64 5.2.26-1.fc39        updates      8.3 MiB
  replacing bash                   aarch64 5.2.21-1.fc39        <unknown>    8.3 MiB
 crypto-policies                   noarch  20231204-1.git1e3a2e updates    149.3 KiB
  replacing crypto-policies        noarch  20231113-1.gitb402e8 <unknown>  149.1 KiB
 glibc                             aarch64 2.38-16.fc39         updates      9.7 MiB
  replacing glibc                  aarch64 2.38-11.fc39         <unknown>    9.7 MiB
 glibc-common                      aarch64 2.38-16.fc39         updates      2.6 MiB
  replacing glibc-common           aarch64 2.38-11.fc39         <unknown>    2.6 MiB
 glibc-minimal-langpack            aarch64 2.38-16.fc39         updates      0.0   B
  replacing glibc-minimal-langpack aarch64 2.38-11.fc39         <unknown>    0.0   B
 gnutls                            aarch64 3.8.3-1.fc39         updates      3.4 MiB
  replacing gnutls                 aarch64 3.8.1-1.fc39         <unknown>    3.4 MiB
 libacl                            aarch64 2.3.1-9.fc39         updates    196.0 KiB
  replacing libacl                 aarch64 2.3.1-8.fc39         <unknown>  196.0 KiB
 libblkid                          aarch64 2.39.3-5.fc39        updates    392.9 KiB
  replacing libblkid               aarch64 2.39.2-1.fc39        <unknown>  392.9 KiB
 libcap                            aarch64 2.48-9.fc39          updates      1.4 MiB
  replacing libcap                 aarch64 2.48-7.fc39          <unknown>    1.4 MiB
 libgcc                            aarch64 13.2.1-6.fc39        updates    349.7 KiB
  replacing libgcc                 aarch64 13.2.1-4.fc39        <unknown>  349.8 KiB
 libidn2                           aarch64 2.3.7-1.fc39         updates    457.1 KiB
  replacing libidn2                aarch64 2.3.4-3.fc39         <unknown>  451.0 KiB
 libmount                          aarch64 2.39.3-5.fc39        updates    484.1 KiB
  replacing libmount               aarch64 2.39.2-1.fc39        <unknown>  484.1 KiB
 libsmartcols                      aarch64 2.39.3-5.fc39        updates    288.1 KiB
  replacing libsmartcols           aarch64 2.39.2-1.fc39        <unknown>  288.1 KiB
 libuuid                           aarch64 2.39.3-5.fc39        updates    197.5 KiB
  replacing libuuid                aarch64 2.39.2-1.fc39        <unknown>  197.5 KiB
 readline                          aarch64 8.2-6.fc39           updates    689.1 KiB
  replacing readline               aarch64 8.2-4.fc39           <unknown>  689.1 KiB
 systemd-libs                      aarch64 254.9-1.fc39         updates      2.4 MiB
  replacing systemd-libs           aarch64 254.5-2.fc39         <unknown>    2.4 MiB
 util-linux-core                   aarch64 2.39.3-5.fc39        updates      6.1 MiB
   replacing util-linux-core       aarch64 2.39.2-1.fc39        <unknown>    5.9 MiB
Installing:
 buildah                           aarch64 1.34.0-1.fc39        updates     28.7 MiB
Installing dependencies:
 audit-libs                        aarch64 3.1.2-8.fc39         updates    547.2 KiB
 containers-common                 noarch  4:1-99.fc39          updates    124.4 KiB
 containers-common-extra           noarch  4:1-99.fc39          updates      0.0   B
 cracklib                          aarch64 2.9.11-2.fc39        fedora     934.7 KiB
 criu                              aarch64 3.19-2.fc39          updates      1.6 MiB
 crun                              aarch64 1.14.3-1.fc39        updates    554.2 KiB
 dbus                              aarch64 1:1.14.10-1.fc39     fedora       0.0   B
 dbus-broker                       aarch64 35-2.fc39            updates    614.2 KiB
 dbus-common                       noarch  1:1.14.10-1.fc39     fedora      11.2 KiB
 device-mapper                     aarch64 1.02.197-1.fc39      updates    630.3 KiB
 device-mapper-libs                aarch64 1.02.197-1.fc39      updates    511.4 KiB
 duktape                           aarch64 2.7.0-5.fc39         fedora     928.1 KiB
 elfutils-default-yama-scope       noarch  0.190-4.fc39         updates      1.8 KiB
 expat                             aarch64 2.6.0-1.fc39         updates    532.9 KiB
 fuse-common                       aarch64 3.16.1-1.fc39        fedora      38.0   B
 fuse3                             aarch64 3.16.1-1.fc39        fedora     457.7 KiB
 fuse3-libs                        aarch64 3.16.1-1.fc39        fedora     353.5 KiB
 gnupg2                            aarch64 2.4.3-4.fc39         updates     12.1 MiB
 gpgme                             aarch64 1.20.0-5.fc39        fedora     805.1 KiB
 gzip                              aarch64 1.12-6.fc39          fedora     475.8 KiB
 iptables-legacy                   aarch64 1.8.9-5.fc39         fedora     207.8 KiB
 iptables-legacy-libs              aarch64 1.8.9-5.fc39         fedora     410.4 KiB
 iptables-libs                     aarch64 1.8.9-5.fc39         fedora      19.2 MiB
 jansson                           aarch64 2.13.1-7.fc39        fedora     220.4 KiB
 json-c                            aarch64 0.17-1.fc39          fedora     202.4 KiB
 kmod                              aarch64 30-6.fc39            fedora     316.5 KiB
 kmod-libs                         aarch64 30-6.fc39            fedora     287.3 KiB
 libargon2                         aarch64 20190702-3.fc39      fedora     213.1 KiB
 libassuan                         aarch64 2.5.6-2.fc39         fedora     279.4 KiB
 libatomic                         aarch64 13.2.1-6.fc39        updates    196.8 KiB
 libb2                             aarch64 0.98.1-9.fc39        fedora     202.1 KiB
 libbsd                            aarch64 0.11.7-5.fc39        fedora     485.7 KiB
 libcap-ng                         aarch64 0.8.3-8.fc39         fedora     416.4 KiB
 libeconf                          aarch64 0.5.2-1.fc39         fedora     204.0 KiB
 libedit                           aarch64 3.1-48.20230828cvs.f fedora     343.8 KiB
 libfdisk                          aarch64 2.39.3-5.fc39        updates    494.9 KiB
 libgcrypt                         aarch64 1.10.2-2.fc39        fedora       1.1 MiB
 libgomp                           aarch64 13.2.1-6.fc39        updates    545.5 KiB
 libgpg-error                      aarch64 1.47-2.fc39          fedora       1.1 MiB
 libibverbs                        aarch64 46.0-4.fc39          fedora       3.9 MiB
 libksba                           aarch64 1.6.4-2.fc39         fedora     522.9 KiB
 libmd                             aarch64 1.1.0-2.fc39         fedora     238.9 KiB
 libmnl                            aarch64 1.0.5-3.fc39         fedora     223.2 KiB
 libnet                            aarch64 1.3-1.fc39           updates    228.7 KiB
 libnetfilter_conntrack            aarch64 1.0.9-2.fc39         fedora     279.5 KiB
 libnfnetlink                      aarch64 1.0.1-24.fc39        fedora     213.8 KiB
 libnftnl                          aarch64 1.2.6-2.fc39         fedora     286.1 KiB
 libnl3                            aarch64 3.9.0-1.fc39         updates      1.7 MiB
 libnsl2                           aarch64 2.0.0-6.fc39         fedora     221.9 KiB
 libpcap                           aarch64 14:1.10.4-2.fc39     fedora     489.6 KiB
 libseccomp                        aarch64 2.5.3-6.fc39         fedora     243.2 KiB
 libsecret                         aarch64 0.21.2-1.fc39        updates    873.3 KiB
 libsemanage                       aarch64 3.5-4.fc39           fedora     364.2 KiB
 libslirp                          aarch64 4.7.0-4.fc39         fedora     278.6 KiB
 libtirpc                          aarch64 1.3.4-0.rc2.fc39     updates    274.7 KiB
 libusb1                           aarch64 1.0.26-3.fc39        fedora     241.0 KiB
 mpdecimal                         aarch64 2.5.1-7.fc39         fedora     328.7 KiB
 netavark                          aarch64 1.10.3-1.fc39        updates     10.0 MiB
 nftables                          aarch64 1:1.0.7-3.fc39       fedora       1.2 MiB
 npth                              aarch64 1.6-14.fc39          fedora     221.4 KiB
 pam-libs                          aarch64 1.5.3-3.fc39         updates    607.9 KiB
 pcsc-lite                         aarch64 2.0.1-1.fc39         updates    354.7 KiB
 pcsc-lite-libs                    aarch64 2.0.1-1.fc39         updates    200.5 KiB
 polkit                            aarch64 123-1.fc39.1         updates      1.4 MiB
 polkit-libs                       aarch64 123-1.fc39.1         updates    415.2 KiB
 polkit-pkla-compat                aarch64 0.1-26.fc39          fedora     425.7 KiB
 protobuf-c                        aarch64 1.4.1-5.fc39         fedora     225.1 KiB
 python-pip-wheel                  noarch  23.2.1-1.fc39        fedora       1.5 MiB
 python3                           aarch64 3.12.1-2.fc39        updates    211.8 KiB
 python3-libs                      aarch64 3.12.1-2.fc39        updates     51.9 MiB
 qemu-user-static-aarch64          aarch64 2:8.1.3-3.fc39       updates     12.9 MiB
 qemu-user-static-alpha            aarch64 2:8.1.3-3.fc39       updates      3.5 MiB
 qemu-user-static-arm              aarch64 2:8.1.3-3.fc39       updates      9.1 MiB
 qemu-user-static-cris             aarch64 2:8.1.3-3.fc39       updates      3.4 MiB
 qemu-user-static-hexagon          aarch64 2:8.1.3-3.fc39       updates      5.8 MiB
 qemu-user-static-hppa             aarch64 2:8.1.3-3.fc39       updates      3.5 MiB
 qemu-user-static-loongarch64      aarch64 2:8.1.3-3.fc39       updates      3.8 MiB
 qemu-user-static-m68k             aarch64 2:8.1.3-3.fc39       updates      3.7 MiB
 qemu-user-static-microblaze       aarch64 2:8.1.3-3.fc39       updates      6.9 MiB
 qemu-user-static-mips             aarch64 2:8.1.3-3.fc39       updates     26.4 MiB
 qemu-user-static-nios2            aarch64 2:8.1.3-3.fc39       updates      3.4 MiB
 qemu-user-static-or1k             aarch64 2:8.1.3-3.fc39       updates      3.4 MiB
 qemu-user-static-ppc              aarch64 2:8.1.3-3.fc39       updates     13.5 MiB
 qemu-user-static-riscv            aarch64 2:8.1.3-3.fc39       updates      9.2 MiB
 qemu-user-static-s390x            aarch64 2:8.1.3-3.fc39       updates      3.9 MiB
 qemu-user-static-sh4              aarch64 2:8.1.3-3.fc39       updates      7.0 MiB
 qemu-user-static-sparc            aarch64 2:8.1.3-3.fc39       updates     10.8 MiB
 qemu-user-static-x86              aarch64 2:8.1.3-3.fc39       updates      8.1 MiB
 qemu-user-static-xtensa           aarch64 2:8.1.3-3.fc39       updates     13.7 MiB
 shadow-utils                      aarch64 2:4.14.0-2.fc39      updates      7.1 MiB
 shadow-utils-subid                aarch64 2:4.14.0-2.fc39      updates    394.8 KiB
 systemd                           aarch64 254.9-1.fc39         updates     25.0 MiB
 systemd-pam                       aarch64 254.9-1.fc39         updates      1.2 MiB
 tpm2-tss                          aarch64 4.0.1-6.fc39         updates      3.2 MiB
 tzdata                            noarch  2024a-2.fc39         updates      1.6 MiB
 xkeyboard-config                  noarch  2.40-1.fc39          updates      6.6 MiB
 yajl                              aarch64 2.1.0-22.fc39        fedora     598.4 KiB
Installing weak dependencies:
 aardvark-dns                      aarch64 1.10.0-1.fc39        updates      2.1 MiB
 cracklib-dicts                    aarch64 2.9.11-2.fc39        fedora       9.3 MiB
 criu-libs                         aarch64 3.19-2.fc39          updates    196.7 KiB
 cryptsetup-libs                   aarch64 2.6.1-3.fc39         fedora       2.1 MiB
 diffutils                         aarch64 3.10-3.fc39          fedora       2.1 MiB
 elfutils-debuginfod-client        aarch64 0.190-4.fc39         updates    396.8 KiB
 elfutils-libelf                   aarch64 0.190-4.fc39         updates      1.1 MiB
 elfutils-libs                     aarch64 0.190-4.fc39         updates      1.0 MiB
 fuse-overlayfs                    aarch64 1.12-2.fc39          fedora     218.8 KiB
 glibc-langpack-en                 aarch64 2.38-16.fc39         updates      5.7 MiB
 gnupg2-smime                      aarch64 2.4.3-4.fc39         updates    739.1 KiB
 libbpf                            aarch64 2:1.1.0-4.fc39       fedora     458.5 KiB
 libpwquality                      aarch64 1.4.5-6.fc39         fedora       1.1 MiB
 libxkbcommon                      aarch64 1.6.0-1.fc39         updates    597.3 KiB
 passt                             aarch64 0^20231230.gf091893- updates    784.7 KiB
 pcsc-lite-ccid                    aarch64 1.5.5-1.fc39         updates      1.9 MiB
 pinentry                          aarch64 1.2.1-4.fc39         fedora     361.7 KiB
 python-unversioned-command        noarch  3.12.1-2.fc39        updates     23.0   B
 qemu-user-static                  aarch64 2:8.1.3-3.fc39       updates     44.6 KiB
 qrencode-libs                     aarch64 4.1.1-5.fc39         fedora     300.9 KiB
 slirp4netns                       aarch64 1.2.2-1.fc39         updates    225.6 KiB
 systemd-networkd                  aarch64 254.9-1.fc39         updates      2.3 MiB
 systemd-resolved                  aarch64 254.9-1.fc39         updates    704.8 KiB
 tar                               aarch64 2:1.35-2.fc39        fedora       3.1 MiB

Transaction Summary:
 Installing:      122 packages
 Upgrading:        18 packages
 Replacing:        18 packages

Total size of inbound packages is 89 MiB. Need to download 89 MiB.
After this operation 390 MiB will be used (install 427 MiB, remove 37MiB).
```

There's a lot of confusing stuff in there, and we can't do anything to
fix that here.

See #5321.

Signed-off-by: Ian Kerins <git@isk.haus>
2024-02-21 00:07:36 -05:00
Daniel J Walsh 7e0d664839
Pass secrets from the host down to internal podman containers
This change will allow RHEL subscriptions from the host to flow to internal containers.

Fixes: containers/common#1735

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-11-13 10:54:49 -05:00
Daniel J Walsh ccac7ca0bf
Run codespell on code
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-09-14 06:05:57 -04:00
Indy Van Mol 4942cc9089 Fixing the owner of the storage.conf.
Adding a chown after the containers storage.conf file is made for the build user in the buildah container image otherwise the file is owned by root while it should be owned by the build user and its group.

Signed-off-by: Indy Van Mol <indy.van.mol@endstra.dev>
2023-08-25 22:26:47 +02:00
Chris Evich 239b2a877a
Cirrus: container/rootless env. var. passthrough
Fixes: https://github.com/containers/buildah/issues/4838

Resolve a long-standing TODO item (and bug fix apparently) relating to
passing important env. var. values into special testing contexts.
Namely container-based and rootless testing.  These changes mostly come
from the (now battle-tested) work by @edsantiago in the podman CI
scripts.  Some podman-CI specific variables have been stripped out, and
other buildah-specific simplifications made.

Signed-off-by: Chris Evich <cevich@redhat.com>
2023-08-02 10:57:21 -04:00
Chris Evich 65c1c9327a
Cirrus: Remove duplicate env. var. definitions
These are pre-defined by the common automation library sourced near the
top of the file.

Signed-off-by: Chris Evich <cevich@redhat.com>
2023-08-01 15:45:39 -04:00
Aditya R 97b84029a9
contrib/buildahimage: set config correctly for rootless build user
For image published at `quay.io/containers/buildah` buildah should
correctly use `fuseoverlay` for rootless `build` user `fuse-overlayfs`.

Closes: https://github.com/containers/buildah/issues/4669

[NO NEW TESTS NEEDED]

Signed-off-by: Aditya R <arajan@redhat.com>
2023-07-03 12:02:45 +05:30
Kir Kolyshkin bd32a04c37 Remove device mapper support
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2023-06-12 12:43:16 -07:00
Chris Evich a630e35131
CI: Support testing w/ podman-next COPR packages
Sometimes important updates need to be made to dependent packages and
run through CI w/o waiting for package release and new CI VM image
builds.  Support this in buildah CI as in podman CI, by updating
packages during setup when the magic string is present and PR is in
draft-mode.

Note: To support containerized testing, both `CIRRUS_CHANGE_TITLE`
and `CIRRUS_PR_DRAFT` env. vars. are passed through.  For these tasks,
this will result in **TWO** updates - One for the host, and another one
in the container.

Signed-off-by: Chris Evich <cevich@redhat.com>
2023-06-01 14:06:16 -04:00
Ed Santiago d58d3a14be Revert "Proof of concept: nightly dependency treadmill"
No longer needed: this functionality is now done by renovatebot.

The nightly cron job has been deleted.

This reverts commit 899ecaaf74.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2023-05-17 09:32:14 -06:00
Aditya R 6d877d89dd
Revert "buildah image should not enable fuse-overlayfs for rootful mode"
This reverts commit 2e25b156f7.

Signed-off-by: Aditya R <arajan@redhat.com>
2023-04-11 12:58:26 +05:30
Daniel J Walsh 2e25b156f7
buildah image should not enable fuse-overlayfs for rootful mode
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-04-05 06:44:10 -04:00
Chris Evich bc2423ebcb
Cirrus: Replace Ubuntu -> Debian SID
Signed-off-by: Chris Evich <cevich@redhat.com>
2023-03-14 17:18:34 -04:00
Daniel J Walsh 376eb73ab9
Add default list of capabilities required to run buildah in a container
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-03-05 06:46:36 -08:00
Chris Evich 1950ab687e
Fix multi-arch manifest-list build timeouts
As of this commit, the build script runs the process on x86_64 hardware
(4cpus/8gig) using emulation for foreign architectures.  Due to various
delays, inefficiencies, and other emulation-related slowdowns, it's
possible for dnf to timeout and/or mis-measure a minimum repository
download rate.  Bump up the minimum download rate by 10x and timeout
interval by double.  This should allow the builds to complete more
consistently.

Signed-off-by: Chris Evich <cevich@redhat.com>
2023-01-13 15:11:26 -05:00
Daniel J Walsh a172388917
codespell code
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-11-03 17:09:03 -04:00
Andrew Meadows 1a2af6864d Update contrib/buildahimage/Containerfile
Co-authored-by: Chris Evich <1183438+cevich@users.noreply.github.com>
Signed-off-by: Andrew Meadows <andrew@befuddled.ca>
2022-10-07 13:37:19 -07:00
Andrew Meadows b5c86a8e05 Correction - `FLAVOR` not `FLAVOUR`
This project uses the American dialect of written English. Not the
English (or Canadian) dialects as some more befuddled individuals might
do. I hope you enjoy the humour of this, I do.

Signed-off-by: Andrew Meadows <andrew@befuddled.ca>
2022-10-07 13:37:19 -07:00
Andrew Meadows f5fc96e79b Changed build argument from `RELEASE` to `FLAVOUR`
Due to concerns about the ambiguous overloaded meaning of RELEASE in
this context, the build argument has been renamed to `FLAVOUR`.

Signed-off-by: Andrew Meadows <andrew@befuddled.ca>
2022-10-07 13:37:19 -07:00
Andrew Meadows 36afa3530e Combine buildahimage Containerfiles
A single `Containerfile` should be easier to maintain and more reliable
than having three nearly identical files. The new file uses an argument
named `RELEASE` with the value `stable`, `testing`, or `upstream`.

Signed-off-by: Andrew Meadows <andrew@befuddled.ca>
2022-10-07 13:37:19 -07:00
Chris Evich 88615e98be
[CI:DOCS] Add quay-description update reminder
Signed-off-by: Chris Evich <cevich@redhat.com>
2022-09-29 14:34:55 -04:00
Andrew Meadows 28195ac9d9 Changing shell list operators from `;` to `&&`
As per discussion with @nalid, updating the inconsistent use of
sequential operator (`;`) to the AND operator (`&&`) to avoid ignoring
errors. (Previous commit mimicked existing style.)

Signed-off-by: Andrew Meadows <andrew@befuddled.ca>
2022-09-28 14:21:31 -07:00
Andrew Meadows fc45803295 Fix buildahimage container.conf permissions regression
Signed-off-by: Andrew Meadows <andrew@befuddled.ca>
2022-09-28 14:21:31 -07:00
Ed Santiago 899ecaaf74 Proof of concept: nightly dependency treadmill
As discussed in f2f: this is the cleanest, simplest mechanism
I can think of to auto-test the Big Three dependencies: simply
run go mod edit immediately after git checkout, then run the
entire CI test suite.

If this approach works, we can set up a new CIRRUS_CRON=treadmill job.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-09-27 13:33:06 -06:00
Giuseppe Scrivano 02d4a6b5f2
test: run in the host cgroup namespace
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2022-09-21 13:45:41 +02:00
Chris Evich 263f5adc3f
[CI:DOCS] Update buildahimage comment
Drop a reference as to why the rpm --setcaps... line is needed, along
with a TODO reminder to check if it's still needed.

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-06-29 11:39:58 -04:00
Chris Evich c0be04e63f
[CI:BUILD] Install latest buildah instead of compiling
When building the multi-arch "upstream" flavor of buildah container
images, it's more optimal to use separate compilation and image
construction steps.  The image-build automation is time-limited,
and operating under a (slow) emulation environment.  So using a
continuously pre-built buildah RPM will also improve build
reliability.

ref: https://github.com/containers/buildah/pull/4062

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-06-27 10:52:35 -04:00
openshift-ci[bot] 0a4fa3cd87
Merge pull request #4062 from lsm5/copr-auto-build
buildah.spec.rpkg: initial addition
2022-06-23 10:01:49 +00:00
Daniel J Walsh ffce8b3666
Make sure cpp is installed in buildah images
[NO NEW TESTS NEEDED]

Fixes: https://github.com/containers/buildah/issues/4070

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-06-22 09:22:04 -04:00
Lokesh Mandvekar 198b4c360b buildah.spec.rpkg: initial addition
This specfile along with a webhook will trigger auto rpm builds on the
`rhcontainerbot/podman-next` copr after every upstream PR merge.

Useful for those who want to fetch the latest upstream buildah without
having to build from source.

This commit also gets rid of `contrib/rpm/buildah.spec` and
`tests/version.bats`.

Known issue: Currently fails to build for EL8 envs.

[NO NEW TESTS NEEDED]

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-06-21 15:10:28 -04:00
Chris Evich ecae0e2fe6
Fix building upstream buildah image
Previously, `;` were separating several `RUN` commands.  This is
dangerous, as failure in one won't result in a build failure.  This was
happening due to the `runc` package having a required dependency on
`contaqiner-selinux` which was excluded.  Fix this by using `&&` and
switching to the crun package.

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-06-17 11:18:44 -04:00
Chris Evich cf6b1bcfba
Docs: Update multi-arch buildah images readme
Contents updated to more closely resemble the same docs in the podman
repository.  Also, remove the `centos7` compatibility section (and
build context) given it's not been built or maintained in over two
years.

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-06-17 11:18:43 -04:00
Daniel J Walsh 0b7c50023b
Fix up buildah images
Fedora no longer ships /etc/containers/storage.conf but
/usr/share/containers/storage.conf, this causes the buildimages
to fail to build. This PR uses the storage.conf in /usr.

Removed Centos7 image, since this distribution is no longer supported
and no reason to ship an image specific to this distribution.
Removed stablebyhand image, since this does not look like it is needed
any longer, and was not being maintained.

[NO NEW TESTS NEEDED]

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-06-13 13:25:34 -04:00
tomsweeneyredhat be9ef3b602 [CI:BUILD] WIP Cleanup Image Dockerfiles
Cleans up the Dockerfiles for the buildah images that land on quay.

A number of readability changes, and an adjustment to sed to
handle storage.conf.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2022-06-04 18:23:46 -04:00
tomsweeneyredhat 6750810f74 Bump to v1.27.0-dev
As the title says
[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2022-05-04 12:28:08 -04:00
tomsweeneyredhat 0a9d6e6eae Bump to v1.26.0
As the title says.

[NO TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2022-05-04 12:28:07 -04:00
Chris Evich cc5e80f6de
Cirrus: Update CI VMs to F36
Signed-off-by: Chris Evich <cevich@redhat.com>
2022-04-28 10:37:33 -04:00
tomsweeneyredhat faebb9fdb2 Bump back to v1.26.0-dev
As the title says

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2022-03-30 12:13:41 -04:00