From 884363fd7746a8badd1036c8b762a86f32e0c409 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 24 Dec 2024 15:38:14 +0530 Subject: [PATCH 01/18] TMT: initial enablement Signed-off-by: Lokesh Mandvekar (cherry picked from commit 3a31f6dc4203370816b61295b286ee5e2b01a35c) --- .fmf/version | 1 + .packit.yaml | 78 +++++++++++++++++++++++++++++++++++++++--- gating.yaml | 12 ++++--- plans/main.fmf | 32 +++++++++++++++++ tests/test_buildah.sh | 70 ------------------------------------- tests/test_buildah.yml | 18 ---------- tests/tests.yml | 1 - tests/tmt/system.fmf | 17 +++++++++ tests/tmt/test.sh | 19 ++++++++++ 9 files changed, 150 insertions(+), 98 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/main.fmf delete mode 100755 tests/test_buildah.sh delete mode 100644 tests/test_buildah.yml delete mode 100644 tests/tests.yml create mode 100644 tests/tmt/system.fmf create mode 100644 tests/tmt/test.sh diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.packit.yaml b/.packit.yaml index 1c751af..e164dab 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -5,6 +5,27 @@ downstream_package_name: buildah upstream_tag_template: v{version} +# These files get synced from upstream to downstream (Fedora / CentOS Stream) on every +# propose-downstream job. This is done so tests maintained upstream can be run +# downstream in Zuul CI and Bodhi. +# Ref: https://packit.dev/docs/configuration#files_to_sync +files_to_sync: + - src: rpm/gating.yaml + dest: gating.yaml + delete: true + - src: plans/ + dest: plans/ + delete: true + mkpath: true + - src: tests/tmt/ + dest: tests/tmt/ + delete: true + mkpath: true + - src: .fmf/ + dest: .fmf/ + delete: true + - .packit.yaml + packages: buildah-fedora: pkg_tool: fedpkg @@ -25,13 +46,13 @@ jobs: notifications: &copr_build_failure_notification failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." - targets: + targets: &fedora_copr_targets - fedora-all-x86_64 - fedora-all-aarch64 enable_net: true - job: copr_build - trigger: pull_request + trigger: ignore packages: [buildah-eln] notifications: *copr_build_failure_notification targets: @@ -44,10 +65,10 @@ jobs: enable_net: true - job: copr_build - trigger: pull_request + trigger: ignore packages: [buildah-centos] notifications: *copr_build_failure_notification - targets: + targets: ¢os_copr_targets - centos-stream-9-x86_64 - centos-stream-9-aarch64 - centos-stream-10-x86_64 @@ -66,6 +87,55 @@ jobs: project: podman-next enable_net: true + - job: tests + trigger: pull_request + packages: [buildah-fedora] + targets: *fedora_copr_targets + require: &dev_tests + label: + absent: + - release + tf_extra_params: + environments: + - artifacts: + - type: repository-file + id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo + identifier: "dev" + + - job: tests + trigger: pull_request + packages: [buildah-fedora] + targets: *fedora_copr_targets + require: &release_tests + label: + present: + - release + preserve_project: true + identifier: "release" + + # FIXME: Enable centos stream tests after containers-common is fixed + # FIXME: centos stream 10 currently also lacks bats + # https://bugzilla.redhat.com/show_bug.cgi?id=2329315 + - job: tests + trigger: ignore + packages: [buildah-centos] + targets: *centos_copr_targets + require: *dev_tests + tf_extra_params: + environments: + - artifacts: + - type: repository-file + id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/centos-stream-$releasever/rhcontainerbot-podman-next-centos-stream-$releasever.repo + identifier: "dev" + + - job: tests + trigger: ignore + packages: [buildah-centos] + targets: *centos_copr_targets + require: *release_tests + preserve_project: true + identifier: "release" + # Sync to Fedora - job: propose_downstream trigger: release diff --git a/gating.yaml b/gating.yaml index c8a218f..1fb3172 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,14 +1,16 @@ --- !Policy product_versions: - fedora-* -decision_context: bodhi_update_push_stable +decision_contexts: + - bodhi_update_push_stable + - bodhi_update_push_testing subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + --- !Policy product_versions: - - fedora-* -decision_context: bodhi_update_push_testing -subject_type: koji_build + - rhel-* +decision_context: osci_compose_gate rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/plans/main.fmf b/plans/main.fmf new file mode 100644 index 0000000..99de783 --- /dev/null +++ b/plans/main.fmf @@ -0,0 +1,32 @@ +discover: + how: fmf + +execute: + how: tmt + +prepare: + - when: distro == centos-stream or distro == rhel + how: shell + script: | + dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(rpm --eval '%{?rhel}').noarch.rpm + dnf -y config-manager --set-enabled epel + order: 10 + - when: initiator == packit + how: shell + script: | + COPR_REPO_FILE="/etc/yum.repos.d/*podman-next*.repo" + if compgen -G $COPR_REPO_FILE > /dev/null; then + sed -i -n '/^priority=/!p;$apriority=1' $COPR_REPO_FILE + fi + dnf -y upgrade --allowerasing + order: 20 + +provision: + how: artemis + hardware: + memory: ">= 16 GB" + cpu: + cores: ">= 4" + threads: ">=8" + disk: + - size: ">= 512 GB" diff --git a/tests/test_buildah.sh b/tests/test_buildah.sh deleted file mode 100755 index ea8eea3..0000000 --- a/tests/test_buildah.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash -e - -# Log program and kernel versions -echo "Important package versions:" -( - uname -r - rpm -qa |\ - egrep 'buildah|podman|conmon|containers-common|crun|runc|iptable|slirp|aardvark|netavark|containernetworking-plugins|systemd|container-selinux' |\ - sort -) | sed -e 's/^/ /' - -# Log environment; or at least the useful bits -echo "Environment:" -env | grep -v LS_COLORS= | sort | sed -e 's/^/ /' - -export BUILDAH_BINARY=/usr/bin/buildah -export IMGTYPE_BINARY=/usr/bin/buildah-imgtype -export COPY_BINARY=/usr/bin/buildah-copy -export TUTORIAL_BINARY=/usr/bin/buildah-tutorial -export INET_BINARY=/usr/bin/buildah-inet - -############################################################################### -# BEGIN setup/teardown - -# Start a registry -pre_bats_setup() { - REGISTRY_FQIN=quay.io/libpod/registry:2 - - AUTHDIR=/tmp/buildah-tests-auth.$$ - mkdir -p $AUTHDIR - - CERT=$AUTHDIR/domain.crt - if [ ! -e $CERT ]; then - openssl req -newkey rsa:4096 -nodes -sha256 \ - -keyout $AUTHDIR/domain.key -x509 -days 2 \ - -out $AUTHDIR/domain.crt \ - -subj "/C=US/ST=Foo/L=Bar/O=Red Hat, Inc./CN=registry host certificate" \ - -addext subjectAltName=DNS:localhost - fi - - if [ ! -e $AUTHDIR/htpasswd ]; then - htpasswd -Bbn testuser testpassword > $AUTHDIR/htpasswd - fi - - podman rm -f registry || true - podman run -d -p 5000:5000 \ - --name registry \ - -v $AUTHDIR:/auth:Z \ - -e "REGISTRY_AUTH=htpasswd" \ - -e "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm" \ - -e REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd \ - -e REGISTRY_HTTP_TLS_CERTIFICATE=/auth/domain.crt \ - -e REGISTRY_HTTP_TLS_KEY=/auth/domain.key \ - $REGISTRY_FQIN -} - -post_bats_teardown() { - podman rm -f registry -} - -# END setup/teardown -############################################################################### -# BEGIN actual test - -pre_bats_setup -bats /usr/share/buildah/test/system -rc=$? -post_bats_teardown - -exit $rc diff --git a/tests/test_buildah.yml b/tests/test_buildah.yml deleted file mode 100644 index dced1f9..0000000 --- a/tests/test_buildah.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -- hosts: localhost - environment: - TMPDIR: /var/tmp - roles: - - role: standard-test-basic - tags: - - classic - - container - required_packages: - - buildah - - buildah-tests - - slirp4netns - tests: - - root-test: - dir: ./ - run: ./test_buildah.sh - timeout: 80m diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 596f735..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1 +0,0 @@ -- import_playbook: test_buildah.yml diff --git a/tests/tmt/system.fmf b/tests/tmt/system.fmf new file mode 100644 index 0000000..7626d20 --- /dev/null +++ b/tests/tmt/system.fmf @@ -0,0 +1,17 @@ +require: + - buildah-tests + - git-daemon + - slirp4netns + +environment: + BUILDAH_BINARY: /usr/bin/buildah + IMGTYPE_BINARY: /usr/bin/buildah-imgtype + INET_BINARY: /usr/bin/buildah-inet + COPY_BINARY: /usr/bin/buildah-copy + TUTORIAL_BINARY: /usr/bin/buildah-tutorial + TMPDIR: /var/tmp + +/local-root: + summary: System tests + test: bash ./test.sh + duration: 60m diff --git a/tests/tmt/test.sh b/tests/tmt/test.sh new file mode 100644 index 0000000..387fd85 --- /dev/null +++ b/tests/tmt/test.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +set -exo pipefail + +uname -r + +rpm -q \ + aardvark-dns \ + buildah \ + buildah-tests \ + conmon \ + container-selinux \ + containers-common \ + containers-common-extra \ + crun \ + netavark \ + systemd + +bats /usr/share/buildah/test/system From 671073448d64c9519d03bd05180befa18ce510e9 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 26 Feb 2025 23:47:50 +0000 Subject: [PATCH 02/18] Update to 1.39.1 upstream release Upstream tag: v1.39.1 Upstream commit: 9347a39c Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 78 +++------------------------------------------------ README.packit | 2 +- buildah.spec | 2 +- sources | 2 +- 5 files changed, 8 insertions(+), 77 deletions(-) diff --git a/.gitignore b/.gitignore index 4169ea7..3d4cc6d 100644 --- a/.gitignore +++ b/.gitignore @@ -720,3 +720,4 @@ /v1.38.0.tar.gz /v1.38.1.tar.gz /v1.39.0.tar.gz +/v1.39.1.tar.gz diff --git a/.packit.yaml b/.packit.yaml index e164dab..1c751af 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -5,27 +5,6 @@ downstream_package_name: buildah upstream_tag_template: v{version} -# These files get synced from upstream to downstream (Fedora / CentOS Stream) on every -# propose-downstream job. This is done so tests maintained upstream can be run -# downstream in Zuul CI and Bodhi. -# Ref: https://packit.dev/docs/configuration#files_to_sync -files_to_sync: - - src: rpm/gating.yaml - dest: gating.yaml - delete: true - - src: plans/ - dest: plans/ - delete: true - mkpath: true - - src: tests/tmt/ - dest: tests/tmt/ - delete: true - mkpath: true - - src: .fmf/ - dest: .fmf/ - delete: true - - .packit.yaml - packages: buildah-fedora: pkg_tool: fedpkg @@ -46,13 +25,13 @@ jobs: notifications: &copr_build_failure_notification failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." - targets: &fedora_copr_targets + targets: - fedora-all-x86_64 - fedora-all-aarch64 enable_net: true - job: copr_build - trigger: ignore + trigger: pull_request packages: [buildah-eln] notifications: *copr_build_failure_notification targets: @@ -65,10 +44,10 @@ jobs: enable_net: true - job: copr_build - trigger: ignore + trigger: pull_request packages: [buildah-centos] notifications: *copr_build_failure_notification - targets: ¢os_copr_targets + targets: - centos-stream-9-x86_64 - centos-stream-9-aarch64 - centos-stream-10-x86_64 @@ -87,55 +66,6 @@ jobs: project: podman-next enable_net: true - - job: tests - trigger: pull_request - packages: [buildah-fedora] - targets: *fedora_copr_targets - require: &dev_tests - label: - absent: - - release - tf_extra_params: - environments: - - artifacts: - - type: repository-file - id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo - identifier: "dev" - - - job: tests - trigger: pull_request - packages: [buildah-fedora] - targets: *fedora_copr_targets - require: &release_tests - label: - present: - - release - preserve_project: true - identifier: "release" - - # FIXME: Enable centos stream tests after containers-common is fixed - # FIXME: centos stream 10 currently also lacks bats - # https://bugzilla.redhat.com/show_bug.cgi?id=2329315 - - job: tests - trigger: ignore - packages: [buildah-centos] - targets: *centos_copr_targets - require: *dev_tests - tf_extra_params: - environments: - - artifacts: - - type: repository-file - id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/centos-stream-$releasever/rhcontainerbot-podman-next-centos-stream-$releasever.repo - identifier: "dev" - - - job: tests - trigger: ignore - packages: [buildah-centos] - targets: *centos_copr_targets - require: *release_tests - preserve_project: true - identifier: "release" - # Sync to Fedora - job: propose_downstream trigger: release diff --git a/README.packit b/README.packit index c1b4159..2cdc258 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.1.0. +The file was generated using packit 1.1.1.post1.dev1+g7c5e02df. diff --git a/buildah.spec b/buildah.spec index 87bca7d..e2a1825 100644 --- a/buildah.spec +++ b/buildah.spec @@ -32,7 +32,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.39.0 +Version: 1.39.1 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease diff --git a/sources b/sources index 07fdd95..11f7106 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.39.0.tar.gz) = 05b16bd00360551f02ad25d88fb24296c91ecc5f9bd930943e4f1e4aef803d8aa632dfda4bd43b36978e7a682d4bf6602611e5ec3feb0301240be47b7dd7f6e3 +SHA512 (v1.39.1.tar.gz) = aacbdf0962e55c1c6f107cf4184c951a72c68678e1940e81ecfdd7b40778a0af39cabaf842dbee8c9a4aa6b370f82b19d0f1abac41027304fd426360ddcf5a7b From 8745f8c456575de07b9432356e0d08c3bea661a2 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 4 Mar 2025 23:31:12 +0000 Subject: [PATCH 03/18] Update to 1.39.2 upstream release Upstream tag: v1.39.2 Upstream commit: d5d9d35f Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- buildah.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3d4cc6d..8b4a2a4 100644 --- a/.gitignore +++ b/.gitignore @@ -721,3 +721,4 @@ /v1.38.1.tar.gz /v1.39.0.tar.gz /v1.39.1.tar.gz +/v1.39.2.tar.gz diff --git a/README.packit b/README.packit index 2cdc258..87210c5 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.1.1.post1.dev1+g7c5e02df. +The file was generated using packit 1.2.0.post1.dev3+g3adf9afe. diff --git a/buildah.spec b/buildah.spec index e2a1825..60d68cc 100644 --- a/buildah.spec +++ b/buildah.spec @@ -32,7 +32,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.39.1 +Version: 1.39.2 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease diff --git a/sources b/sources index 11f7106..dad870d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.39.1.tar.gz) = aacbdf0962e55c1c6f107cf4184c951a72c68678e1940e81ecfdd7b40778a0af39cabaf842dbee8c9a4aa6b370f82b19d0f1abac41027304fd426360ddcf5a7b +SHA512 (v1.39.2.tar.gz) = 4a95093894cc82a68b4e98003fd89c97b0e16f282b21d38d4425cc06fc8fd27c92352cf59d5e9c97c54492b773d15f9a1708a0597aa82675f8a1d30193b06167 From b68fa2c7213c94eadb913d3bc3de5e5651d867f5 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 14 Mar 2025 19:52:05 +0000 Subject: [PATCH 04/18] Update to 1.39.3 upstream release Upstream tag: v1.39.3 Upstream commit: 0a5cebb3 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- buildah.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8b4a2a4..6d12f85 100644 --- a/.gitignore +++ b/.gitignore @@ -722,3 +722,4 @@ /v1.39.0.tar.gz /v1.39.1.tar.gz /v1.39.2.tar.gz +/v1.39.3.tar.gz diff --git a/README.packit b/README.packit index 87210c5..f5cc99f 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.2.0.post1.dev3+g3adf9afe. +The file was generated using packit 1.2.0.post1.dev13+g55ed4527. diff --git a/buildah.spec b/buildah.spec index 60d68cc..058fadb 100644 --- a/buildah.spec +++ b/buildah.spec @@ -32,7 +32,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.39.2 +Version: 1.39.3 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease diff --git a/sources b/sources index dad870d..71d40b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.39.2.tar.gz) = 4a95093894cc82a68b4e98003fd89c97b0e16f282b21d38d4425cc06fc8fd27c92352cf59d5e9c97c54492b773d15f9a1708a0597aa82675f8a1d30193b06167 +SHA512 (v1.39.3.tar.gz) = 95b7e30e8e3b112ac0cc2f2378d0532bf37d1a38a1bc94e246f46408a3169ff46ac3cca587f80acdcfeea3cbfbaebaf01467329fad979b3790106bdab7da5814 From 81d952b145ef358b3c7c7718fe52da90003317b9 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 28 Mar 2025 14:39:59 +0000 Subject: [PATCH 05/18] Update to 1.39.4 upstream release Upstream tag: v1.39.4 Upstream commit: 5b7b7ca3 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- buildah.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6d12f85..c512b16 100644 --- a/.gitignore +++ b/.gitignore @@ -723,3 +723,4 @@ /v1.39.1.tar.gz /v1.39.2.tar.gz /v1.39.3.tar.gz +/v1.39.4.tar.gz diff --git a/README.packit b/README.packit index f5cc99f..ad2b8e5 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.2.0.post1.dev13+g55ed4527. +The file was generated using packit 1.3.0.post1.dev4+gb85da743. diff --git a/buildah.spec b/buildah.spec index 058fadb..3c42c82 100644 --- a/buildah.spec +++ b/buildah.spec @@ -32,7 +32,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.39.3 +Version: 1.39.4 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease diff --git a/sources b/sources index 71d40b8..6def8f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.39.3.tar.gz) = 95b7e30e8e3b112ac0cc2f2378d0532bf37d1a38a1bc94e246f46408a3169ff46ac3cca587f80acdcfeea3cbfbaebaf01467329fad979b3790106bdab7da5814 +SHA512 (v1.39.4.tar.gz) = c721660f94010a0dc8b01502db565b486c53962ee1933e03dd2297cf5d30ac9edef6c92491f41c8c61bee946302e7a39ecff55b2ad3e34ed649222c9655262c2 From fe9c6e21efbb97aa3977b4b11b92789e782a969e Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 21 Apr 2025 17:43:13 +0000 Subject: [PATCH 06/18] Update to 1.40.0 upstream release Upstream tag: v1.40.0 Upstream commit: ff62e3e8 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 60 +++++++++++++++++++++++++++++--- README.packit | 2 +- buildah.spec | 8 +++-- plans/main.fmf | 2 ++ sources | 2 +- tests/tmt/system.fmf | 6 ++-- tests/tmt/{test.sh => system.sh} | 1 - 8 files changed, 70 insertions(+), 12 deletions(-) rename tests/tmt/{test.sh => system.sh} (89%) diff --git a/.gitignore b/.gitignore index c512b16..bf00b2b 100644 --- a/.gitignore +++ b/.gitignore @@ -724,3 +724,4 @@ /v1.39.2.tar.gz /v1.39.3.tar.gz /v1.39.4.tar.gz +/v1.40.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 1c751af..314813c 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -5,6 +5,27 @@ downstream_package_name: buildah upstream_tag_template: v{version} +# These files get synced from upstream to downstream (Fedora / CentOS Stream) on every +# propose-downstream job. This is done so tests maintained upstream can be run +# downstream in Zuul CI and Bodhi. +# Ref: https://packit.dev/docs/configuration#files_to_sync +files_to_sync: + - src: rpm/gating.yaml + dest: gating.yaml + delete: true + - src: plans/ + dest: plans/ + delete: true + mkpath: true + - src: tests/tmt/ + dest: tests/tmt/ + delete: true + mkpath: true + - src: .fmf/ + dest: .fmf/ + delete: true + - .packit.yaml + packages: buildah-fedora: pkg_tool: fedpkg @@ -25,9 +46,13 @@ jobs: notifications: &copr_build_failure_notification failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." - targets: - - fedora-all-x86_64 - - fedora-all-aarch64 + targets: &fedora_copr_targets + # f40 ships go 1.22 and we require go 1.23 now. This should be revert to fedora-all + # once either f40 is rebased to go 1.23 or f42 is released and f40 EOL. + - fedora-latest-stable-x86_64 + - fedora-latest-stable-aarch64 + - fedora-development-x86_64 + - fedora-development-aarch64 enable_net: true - job: copr_build @@ -47,7 +72,7 @@ jobs: trigger: pull_request packages: [buildah-centos] notifications: *copr_build_failure_notification - targets: + targets: ¢os_copr_targets - centos-stream-9-x86_64 - centos-stream-9-aarch64 - centos-stream-10-x86_64 @@ -66,6 +91,33 @@ jobs: project: podman-next enable_net: true + # Tests on Fedora for main branch PRs + - job: tests + trigger: pull_request + packages: [buildah-fedora] + targets: &fedora_copr_test_targets + # See the other comment above, this should be reverted to fedora-all when possible. + - fedora-latest-stable-x86_64 + - fedora-development-x86_64 + tf_extra_params: + environments: + - artifacts: + - type: repository-file + id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo + + # Tests on CentOS Stream for main branch PRs + - job: tests + trigger: pull_request + packages: [buildah-centos] + targets: ¢os_copr_test_targets + - centos-stream-9-x86_64 + - centos-stream-10-x86_64 + tf_extra_params: + environments: + - artifacts: + - type: repository-file + id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/centos-stream-$releasever/rhcontainerbot-podman-next-centos-stream-$releasever.repo + # Sync to Fedora - job: propose_downstream trigger: release diff --git a/README.packit b/README.packit index ad2b8e5..807ffc6 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.3.0.post1.dev4+gb85da743. +The file was generated using packit 1.6.0.post1.dev2+gd5a7662a. diff --git a/buildah.spec b/buildah.spec index 3c42c82..7b7c62f 100644 --- a/buildah.spec +++ b/buildah.spec @@ -32,7 +32,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.39.4 +Version: 1.40.0 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease @@ -79,12 +79,16 @@ or * save container's root file system layer to create a new image * delete a working container or an image +# This subpackage is only intended for CI testing. +# Not meant for end user/customer usage. %package tests Summary: Tests for %{name} Requires: %{name} = %{epoch}:%{version}-%{release} -%if %{defined fedora} +%if %{defined bats_epel} Requires: bats +%else +Recommends: bats %endif Requires: bzip2 Requires: podman diff --git a/plans/main.fmf b/plans/main.fmf index 99de783..b982e76 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -30,3 +30,5 @@ provision: threads: ">=8" disk: - size: ">= 512 GB" + + diff --git a/sources b/sources index 6def8f9..67483b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.39.4.tar.gz) = c721660f94010a0dc8b01502db565b486c53962ee1933e03dd2297cf5d30ac9edef6c92491f41c8c61bee946302e7a39ecff55b2ad3e34ed649222c9655262c2 +SHA512 (v1.40.0.tar.gz) = bb96d04a17ab5a77e5d984dca369e3890131044c505ae3b030d95ffd66378df22da33315a50c9e500e783345ded23ebacdfa0965002a18e1d929c5fa3ce39311 diff --git a/tests/tmt/system.fmf b/tests/tmt/system.fmf index 7626d20..f34f4d9 100644 --- a/tests/tmt/system.fmf +++ b/tests/tmt/system.fmf @@ -11,7 +11,7 @@ environment: TUTORIAL_BINARY: /usr/bin/buildah-tutorial TMPDIR: /var/tmp -/local-root: - summary: System tests - test: bash ./test.sh +/local/root: + summary: System test + test: bash ./system.sh duration: 60m diff --git a/tests/tmt/test.sh b/tests/tmt/system.sh similarity index 89% rename from tests/tmt/test.sh rename to tests/tmt/system.sh index 387fd85..73553aa 100644 --- a/tests/tmt/test.sh +++ b/tests/tmt/system.sh @@ -11,7 +11,6 @@ rpm -q \ conmon \ container-selinux \ containers-common \ - containers-common-extra \ crun \ netavark \ systemd From f23129c06859c23f8f05868be2554cacc9e147d7 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 4 Jun 2025 12:41:11 +0000 Subject: [PATCH 07/18] Update to 1.40.1 upstream release Upstream tag: v1.40.1 Upstream commit: b013f347 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- buildah.spec | 5 ++++- sources | 2 +- tests/tmt/system.fmf | 1 + 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bf00b2b..713f474 100644 --- a/.gitignore +++ b/.gitignore @@ -725,3 +725,4 @@ /v1.39.3.tar.gz /v1.39.4.tar.gz /v1.40.0.tar.gz +/v1.40.1.tar.gz diff --git a/README.packit b/README.packit index 807ffc6..6beb40f 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.6.0.post1.dev2+gd5a7662a. +The file was generated using packit 1.8.0.post1.dev31+g9980e597. diff --git a/buildah.spec b/buildah.spec index 7b7c62f..c67c445 100644 --- a/buildah.spec +++ b/buildah.spec @@ -32,7 +32,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.40.0 +Version: 1.40.1 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease @@ -137,6 +137,7 @@ export BUILDTAGS+=" libtrust_openssl" %gobuild -o bin/copy ./tests/copy %gobuild -o bin/tutorial ./tests/tutorial %gobuild -o bin/inet ./tests/inet +%gobuild -o bin/dumpspec ./tests/dumpspec %{__make} docs %install @@ -148,6 +149,7 @@ cp bin/imgtype %{buildroot}/%{_bindir}/%{name}-imgtype cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy cp bin/tutorial %{buildroot}/%{_bindir}/%{name}-tutorial cp bin/inet %{buildroot}/%{_bindir}/%{name}-inet +cp bin/dumpspec %{buildroot}/%{_bindir}/%{name}-dumpspec rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/* @@ -172,6 +174,7 @@ rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/* %{_bindir}/%{name}-copy %{_bindir}/%{name}-tutorial %{_bindir}/%{name}-inet +%{_bindir}/%{name}-dumpspec %{_datadir}/%{name}/test %changelog diff --git a/sources b/sources index 67483b7..64f4c4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.40.0.tar.gz) = bb96d04a17ab5a77e5d984dca369e3890131044c505ae3b030d95ffd66378df22da33315a50c9e500e783345ded23ebacdfa0965002a18e1d929c5fa3ce39311 +SHA512 (v1.40.1.tar.gz) = 6b37b6cc5fa3d7972800cfaef5919df8ee6c9220e8635850ee9d8356645b08afa4252d688f4316b3265e5f6aef6fa0647fb4f7602b7add292fc8b56a74c4fa1f diff --git a/tests/tmt/system.fmf b/tests/tmt/system.fmf index f34f4d9..49b3619 100644 --- a/tests/tmt/system.fmf +++ b/tests/tmt/system.fmf @@ -9,6 +9,7 @@ environment: INET_BINARY: /usr/bin/buildah-inet COPY_BINARY: /usr/bin/buildah-copy TUTORIAL_BINARY: /usr/bin/buildah-tutorial + DUMPSPEC_BINARY: /usr/bin/buildah-dumpspec TMPDIR: /var/tmp /local/root: From a603402a746c82fa627edbbf356942d225e0471f Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 21 Jul 2025 13:49:07 +0000 Subject: [PATCH 08/18] Update to 1.41.0 upstream release Upstream tag: v1.41.0 Upstream commit: 9f185b77 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 30 ++++++++++++++++-------------- README.packit | 2 +- buildah.spec | 11 +++++++---- sources | 2 +- tests/tmt/system.fmf | 6 ++++++ 6 files changed, 32 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 713f474..1f70052 100644 --- a/.gitignore +++ b/.gitignore @@ -726,3 +726,4 @@ /v1.39.4.tar.gz /v1.40.0.tar.gz /v1.40.1.tar.gz +/v1.41.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 314813c..032e9e1 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -46,17 +46,19 @@ jobs: notifications: &copr_build_failure_notification failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." + # Fedora aliases documentation: https://packit.dev/docs/configuration#aliases + # python3-fedora-distro-aliases provides `resolve-fedora-aliases` command targets: &fedora_copr_targets - # f40 ships go 1.22 and we require go 1.23 now. This should be revert to fedora-all - # once either f40 is rebased to go 1.23 or f42 is released and f40 EOL. - - fedora-latest-stable-x86_64 - - fedora-latest-stable-aarch64 - - fedora-development-x86_64 - - fedora-development-aarch64 + - fedora-all-x86_64 + - fedora-all-aarch64 enable_net: true + # Disable osh diff scan until Go support is available + # Ref: https://github.com/openscanhub/known-false-positives/pull/30#issuecomment-2858698495 + osh_diff_scan_after_copr_build: false + # Ignore until golang is updated in distro buildroot to 1.23.3+ - job: copr_build - trigger: pull_request + trigger: ignore packages: [buildah-eln] notifications: *copr_build_failure_notification targets: @@ -68,8 +70,9 @@ jobs: - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/aarch64/" enable_net: true + # Ignore until golang is updated in distro buildroot to 1.23.3+ - job: copr_build - trigger: pull_request + trigger: ignore packages: [buildah-centos] notifications: *copr_build_failure_notification targets: ¢os_copr_targets @@ -95,21 +98,20 @@ jobs: - job: tests trigger: pull_request packages: [buildah-fedora] - targets: &fedora_copr_test_targets - # See the other comment above, this should be reverted to fedora-all when possible. - - fedora-latest-stable-x86_64 - - fedora-development-x86_64 + targets: + - fedora-all-x86_64 tf_extra_params: environments: - artifacts: - type: repository-file id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo + # Ignore until golang is updated in distro buildroot to 1.23.3+ # Tests on CentOS Stream for main branch PRs - job: tests - trigger: pull_request + trigger: ignore packages: [buildah-centos] - targets: ¢os_copr_test_targets + targets: - centos-stream-9-x86_64 - centos-stream-10-x86_64 tf_extra_params: diff --git a/README.packit b/README.packit index 6beb40f..dde2a46 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.8.0.post1.dev31+g9980e597. +The file was generated using packit 1.9.0.post1.dev4+g48b4c222. diff --git a/buildah.spec b/buildah.spec index c67c445..6e1c446 100644 --- a/buildah.spec +++ b/buildah.spec @@ -32,7 +32,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.40.1 +Version: 1.41.0 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease @@ -56,11 +56,11 @@ BuildRequires: go-rpm-macros BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: make -BuildRequires: ostree-devel %if %{defined build_with_btrfs} BuildRequires: btrfs-progs-devel %endif BuildRequires: shadow-utils-subid-devel +BuildRequires: sqlite-devel Requires: containers-common-extra %if %{defined fedora} BuildRequires: libseccomp-static @@ -123,9 +123,9 @@ export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full" export CNI_VERSION=`grep '^# github.com/containernetworking/cni ' src/modules.txt | sed 's,.* ,,'` export LDFLAGS="-X main.buildInfo=`date +%s` -X main.cniVersion=${CNI_VERSION}" -export BUILDTAGS="seccomp $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)" +export BUILDTAGS="seccomp $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh) libsqlite3" %if !%{defined build_with_btrfs} -export BUILDTAGS+=" btrfs_noversion exclude_graphdriver_btrfs" +export BUILDTAGS+=" exclude_graphdriver_btrfs" %endif %if %{defined fips} @@ -138,6 +138,7 @@ export BUILDTAGS+=" libtrust_openssl" %gobuild -o bin/tutorial ./tests/tutorial %gobuild -o bin/inet ./tests/inet %gobuild -o bin/dumpspec ./tests/dumpspec +%gobuild -o bin/passwd ./tests/passwd %{__make} docs %install @@ -150,6 +151,7 @@ cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy cp bin/tutorial %{buildroot}/%{_bindir}/%{name}-tutorial cp bin/inet %{buildroot}/%{_bindir}/%{name}-inet cp bin/dumpspec %{buildroot}/%{_bindir}/%{name}-dumpspec +cp bin/passwd %{buildroot}/%{_bindir}/%{name}-passwd rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/* @@ -175,6 +177,7 @@ rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/* %{_bindir}/%{name}-tutorial %{_bindir}/%{name}-inet %{_bindir}/%{name}-dumpspec +%{_bindir}/%{name}-passwd %{_datadir}/%{name}/test %changelog diff --git a/sources b/sources index 64f4c4b..be6b0b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.40.1.tar.gz) = 6b37b6cc5fa3d7972800cfaef5919df8ee6c9220e8635850ee9d8356645b08afa4252d688f4316b3265e5f6aef6fa0647fb4f7602b7add292fc8b56a74c4fa1f +SHA512 (v1.41.0.tar.gz) = 50be5c400a5063c12d5b97dc285d4969e50e88fa21de537f1c2317df36a1ccabf26ba70ece9e3e5c891e76ee8d85ab946029dc240de40ec88c86ad678e963823 diff --git a/tests/tmt/system.fmf b/tests/tmt/system.fmf index 49b3619..eb6b766 100644 --- a/tests/tmt/system.fmf +++ b/tests/tmt/system.fmf @@ -10,8 +10,14 @@ environment: COPY_BINARY: /usr/bin/buildah-copy TUTORIAL_BINARY: /usr/bin/buildah-tutorial DUMPSPEC_BINARY: /usr/bin/buildah-dumpspec + PASSWD_BINARY: /usr/bin/buildah-passwd TMPDIR: /var/tmp +adjust: + - when: initiator != "packit" + environment+: + RELEASE_TESTING: true + /local/root: summary: System test test: bash ./system.sh From 3832cd03ab15f04da576c778d12a4646d8358485 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 7 Aug 2025 13:24:33 +0000 Subject: [PATCH 09/18] Update to 1.41.1 upstream release Upstream tag: v1.41.1 Upstream commit: 2de767f3 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- buildah.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1f70052..573a4dd 100644 --- a/.gitignore +++ b/.gitignore @@ -727,3 +727,4 @@ /v1.40.0.tar.gz /v1.40.1.tar.gz /v1.41.0.tar.gz +/v1.41.1.tar.gz diff --git a/README.packit b/README.packit index dde2a46..3ad54d6 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.9.0.post1.dev4+g48b4c222. +The file was generated using packit 1.11.0. diff --git a/buildah.spec b/buildah.spec index 6e1c446..99a096f 100644 --- a/buildah.spec +++ b/buildah.spec @@ -32,7 +32,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.41.0 +Version: 1.41.1 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease diff --git a/sources b/sources index be6b0b7..3b55b0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.41.0.tar.gz) = 50be5c400a5063c12d5b97dc285d4969e50e88fa21de537f1c2317df36a1ccabf26ba70ece9e3e5c891e76ee8d85ab946029dc240de40ec88c86ad678e963823 +SHA512 (v1.41.1.tar.gz) = 0b953fb8bc2d6b9c83919d1a12ce2757e18c1df4a230be506a3a207727a2390fd78de9e2fd919e99f764d7166765354f056f84f07852ec1b114c44d637370816 From 2c49870cb8b128531ad5ea704c71323972b636f1 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 13 Aug 2025 18:57:32 +0000 Subject: [PATCH 10/18] Update to 1.41.2 upstream release Upstream tag: v1.41.2 Upstream commit: 5442721d Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + buildah.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 573a4dd..383e353 100644 --- a/.gitignore +++ b/.gitignore @@ -728,3 +728,4 @@ /v1.40.1.tar.gz /v1.41.0.tar.gz /v1.41.1.tar.gz +/v1.41.2.tar.gz diff --git a/buildah.spec b/buildah.spec index 99a096f..68ac9ca 100644 --- a/buildah.spec +++ b/buildah.spec @@ -32,7 +32,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.41.1 +Version: 1.41.2 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease diff --git a/sources b/sources index 3b55b0e..148d707 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.41.1.tar.gz) = 0b953fb8bc2d6b9c83919d1a12ce2757e18c1df4a230be506a3a207727a2390fd78de9e2fd919e99f764d7166765354f056f84f07852ec1b114c44d637370816 +SHA512 (v1.41.2.tar.gz) = fd8884e9d0e3f18cabc73eadf0cb24ee642aebb4dca5b1d172839c32ff36196a213f6cddbd7109390e5af99e22afbc584e0f3a6a4dd7b98c5b2402388f976744 From 9296bd19cbf389ada96731de01ee53e5d1a9e97d Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 14 Aug 2025 18:55:44 +0000 Subject: [PATCH 11/18] Update to 1.41.3 upstream release Upstream tag: v1.41.3 Upstream commit: b60c59c7 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + buildah.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 383e353..f80be95 100644 --- a/.gitignore +++ b/.gitignore @@ -729,3 +729,4 @@ /v1.41.0.tar.gz /v1.41.1.tar.gz /v1.41.2.tar.gz +/v1.41.3.tar.gz diff --git a/buildah.spec b/buildah.spec index 68ac9ca..297ab1a 100644 --- a/buildah.spec +++ b/buildah.spec @@ -32,7 +32,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.41.2 +Version: 1.41.3 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease diff --git a/sources b/sources index 148d707..69ec871 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.41.2.tar.gz) = fd8884e9d0e3f18cabc73eadf0cb24ee642aebb4dca5b1d172839c32ff36196a213f6cddbd7109390e5af99e22afbc584e0f3a6a4dd7b98c5b2402388f976744 +SHA512 (v1.41.3.tar.gz) = b106f74a1eea63a38bc28218ad71bb0073c15ae879e657111373b61175d81591ee7c9b4579b2135759f73f3512001237ae56fa6463cade57b8adb0d847b4f840 From c044ac1ac908b8bfa7df993f1ebc7852cef9c96f Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 4 Sep 2025 15:30:00 +0000 Subject: [PATCH 12/18] Update to 1.41.4 upstream release Upstream tag: v1.41.4 Upstream commit: 4094f92e Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- buildah.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f80be95..5082082 100644 --- a/.gitignore +++ b/.gitignore @@ -730,3 +730,4 @@ /v1.41.1.tar.gz /v1.41.2.tar.gz /v1.41.3.tar.gz +/v1.41.4.tar.gz diff --git a/README.packit b/README.packit index 3ad54d6..fb341a1 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.11.0. +The file was generated using packit 1.11.0.post1.dev7+gfdcdf3a32. diff --git a/buildah.spec b/buildah.spec index 297ab1a..5f95bd8 100644 --- a/buildah.spec +++ b/buildah.spec @@ -32,7 +32,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.41.3 +Version: 1.41.4 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease diff --git a/sources b/sources index 69ec871..3db3d7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.41.3.tar.gz) = b106f74a1eea63a38bc28218ad71bb0073c15ae879e657111373b61175d81591ee7c9b4579b2135759f73f3512001237ae56fa6463cade57b8adb0d847b4f840 +SHA512 (v1.41.4.tar.gz) = a2f4d7654293baf4267293b33f9a559f9e027bcde816d6a0690f8b9df4256f4989f27331fe6fede98a6e676e3d34a706ef0fb468085afc728aea4c0ea968636c From 26c0a869a042f40357481077f32f7709455f1673 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 29 Sep 2025 19:13:49 +0000 Subject: [PATCH 13/18] Update to 1.41.5 upstream release Upstream tag: v1.41.5 Upstream commit: 7d95c695 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + buildah.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5082082..484d568 100644 --- a/.gitignore +++ b/.gitignore @@ -731,3 +731,4 @@ /v1.41.2.tar.gz /v1.41.3.tar.gz /v1.41.4.tar.gz +/v1.41.5.tar.gz diff --git a/buildah.spec b/buildah.spec index 5f95bd8..431df24 100644 --- a/buildah.spec +++ b/buildah.spec @@ -32,7 +32,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.41.4 +Version: 1.41.5 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease diff --git a/sources b/sources index 3db3d7e..0dfba83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.41.4.tar.gz) = a2f4d7654293baf4267293b33f9a559f9e027bcde816d6a0690f8b9df4256f4989f27331fe6fede98a6e676e3d34a706ef0fb468085afc728aea4c0ea968636c +SHA512 (v1.41.5.tar.gz) = 11067b5e80a3f4d5b9544dcaa29231023e6aa7f144ef463b6823ad65e11af34f61571bd6ab1d63046042fa80f7c4a68b4b1f43c145f35f474144b3c7d3b04b3d From 7cefbe37ae96afea33b7c35670eb41e3dbdc2381 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 22 Oct 2025 15:20:28 +0000 Subject: [PATCH 14/18] Update to 1.42.0 upstream release Upstream tag: v1.42.0 Upstream commit: 1ba41f03 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- buildah.spec | 8 +++++++- sources | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 484d568..c806723 100644 --- a/.gitignore +++ b/.gitignore @@ -732,3 +732,4 @@ /v1.41.3.tar.gz /v1.41.4.tar.gz /v1.41.5.tar.gz +/v1.42.0.tar.gz diff --git a/README.packit b/README.packit index fb341a1..2511bf4 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.11.0.post1.dev7+gfdcdf3a32. +The file was generated using packit 1.12.0. diff --git a/buildah.spec b/buildah.spec index 431df24..2ff2112 100644 --- a/buildah.spec +++ b/buildah.spec @@ -32,7 +32,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.41.5 +Version: 1.42.0 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease @@ -139,6 +139,8 @@ export BUILDTAGS+=" libtrust_openssl" %gobuild -o bin/inet ./tests/inet %gobuild -o bin/dumpspec ./tests/dumpspec %gobuild -o bin/passwd ./tests/passwd +%gobuild -o bin/crash ./tests/crash +%gobuild -o bin/wait ./tests/wait %{__make} docs %install @@ -152,6 +154,8 @@ cp bin/tutorial %{buildroot}/%{_bindir}/%{name}-tutorial cp bin/inet %{buildroot}/%{_bindir}/%{name}-inet cp bin/dumpspec %{buildroot}/%{_bindir}/%{name}-dumpspec cp bin/passwd %{buildroot}/%{_bindir}/%{name}-passwd +cp bin/crash %{buildroot}/%{_bindir}/%{name}-crash +cp bin/wait %{buildroot}/%{_bindir}/%{name}-wait rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/* @@ -178,6 +182,8 @@ rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/* %{_bindir}/%{name}-inet %{_bindir}/%{name}-dumpspec %{_bindir}/%{name}-passwd +%{_bindir}/%{name}-crash +%{_bindir}/%{name}-wait %{_datadir}/%{name}/test %changelog diff --git a/sources b/sources index 0dfba83..0f8bdfa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.41.5.tar.gz) = 11067b5e80a3f4d5b9544dcaa29231023e6aa7f144ef463b6823ad65e11af34f61571bd6ab1d63046042fa80f7c4a68b4b1f43c145f35f474144b3c7d3b04b3d +SHA512 (v1.42.0.tar.gz) = becea994798624b1bdc815bb74aeaabc90af6f90a16332f771d56d5d619ec73affff1671b835772064a0c5a4a317da08d6deba737aa4cf9111382888d4770649 From 83f7ce62937954f492a6cf00dee16d89be89056d Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 23 Oct 2025 08:44:05 -0400 Subject: [PATCH 15/18] cleanup changelog (cherry picked from commit 90ad4c354ac777cfef2a16b79c39bc22ea085ec2) --- buildah.spec | 8 -------- 1 file changed, 8 deletions(-) diff --git a/buildah.spec b/buildah.spec index 2ff2112..4e7bd63 100644 --- a/buildah.spec +++ b/buildah.spec @@ -187,12 +187,4 @@ rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/* %{_datadir}/%{name}/test %changelog -%if %{defined autochangelog} %autochangelog -%else -# NOTE: This changelog will be visible on CentOS 8 Stream builds -# Other envs are capable of handling autochangelog -* Fri Jun 16 2023 RH Container Bot -- Placeholder changelog for envs that are not autochangelog-ready. -- Contact upstream if you need to report an issue with the build. -%endif From 26f3c37171f7c001cd03c94dd644124f337d56eb Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 3 Nov 2025 11:14:16 -0500 Subject: [PATCH 16/18] Rebuild for CVE fixes Resolves: CVE-2025-58185, CVE-2025-58188, CVE-2025-61723 (cherry picked from commit 7c141b863e69837aa781b50ebc859b4d287a6793) From 78e446a51ed03144b7b1114a3a04c6f5073b0643 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 11 Nov 2025 14:28:56 +0000 Subject: [PATCH 17/18] Update to 1.42.1 upstream release Upstream tag: v1.42.1 Upstream commit: de21106b Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- buildah.spec | 12 +++++++++++- sources | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c806723..fbd3660 100644 --- a/.gitignore +++ b/.gitignore @@ -733,3 +733,4 @@ /v1.41.4.tar.gz /v1.41.5.tar.gz /v1.42.0.tar.gz +/v1.42.1.tar.gz diff --git a/README.packit b/README.packit index 2511bf4..e03362b 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.12.0. +The file was generated using packit 1.12.0.post1.dev13+gd51655c23. diff --git a/buildah.spec b/buildah.spec index 4e7bd63..9fdce1b 100644 --- a/buildah.spec +++ b/buildah.spec @@ -11,6 +11,9 @@ %if %{defined fedora} %define build_with_btrfs 1 +%if 0%{?fedora} >= 43 +%define sequoia 1 +%endif %endif %if %{defined rhel} @@ -32,7 +35,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.42.0 +Version: 1.42.1 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease @@ -69,6 +72,9 @@ BuildRequires: libseccomp-devel %endif Requires: libseccomp >= 2.4.1-0 Suggests: cpp +%if %{defined sequoia} +Requires: podman-sequoia +%endif %description The %{name} package provides a command line tool which can be used to @@ -132,6 +138,10 @@ export BUILDTAGS+=" exclude_graphdriver_btrfs" export BUILDTAGS+=" libtrust_openssl" %endif +%if %{defined sequoia} +export BUILDTAGS+=" containers_image_sequoia" +%endif + %gobuild -o bin/%{name} ./cmd/%{name} %gobuild -o bin/imgtype ./tests/imgtype %gobuild -o bin/copy ./tests/copy diff --git a/sources b/sources index 0f8bdfa..cf48c42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.42.0.tar.gz) = becea994798624b1bdc815bb74aeaabc90af6f90a16332f771d56d5d619ec73affff1671b835772064a0c5a4a317da08d6deba737aa4cf9111382888d4770649 +SHA512 (v1.42.1.tar.gz) = 87c512fe81b76767a84663f2b03edb3408c42286c540c51c5497ac5e7d05887fba5fdac9114547dbe6781f033710e2d3a96a7312d750f9232378bb865d0574bf From f19c6cd31ce0517b5be3af68e2660c1a8302a00f Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 2 Dec 2025 22:04:29 +0000 Subject: [PATCH 18/18] Update to 1.42.2 upstream release Upstream tag: v1.42.2 Upstream commit: c0cc9725 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- buildah.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fbd3660..ae2c48c 100644 --- a/.gitignore +++ b/.gitignore @@ -734,3 +734,4 @@ /v1.41.5.tar.gz /v1.42.0.tar.gz /v1.42.1.tar.gz +/v1.42.2.tar.gz diff --git a/README.packit b/README.packit index e03362b..b4b46e3 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.12.0.post1.dev13+gd51655c23. +The file was generated using packit 1.12.0.post1.dev20+g7d30dac21. diff --git a/buildah.spec b/buildah.spec index 9fdce1b..9751b59 100644 --- a/buildah.spec +++ b/buildah.spec @@ -35,7 +35,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.42.1 +Version: 1.42.2 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease diff --git a/sources b/sources index cf48c42..c210586 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.42.1.tar.gz) = 87c512fe81b76767a84663f2b03edb3408c42286c540c51c5497ac5e7d05887fba5fdac9114547dbe6781f033710e2d3a96a7312d750f9232378bb865d0574bf +SHA512 (v1.42.2.tar.gz) = adb1de700db9b589639f6fd02cad95d9bedacb9d0363838315f33c978a8c900570d55af95073992ff69cff4f2a9d18776c5d786af294aaa1604144580c957414