public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Packit <hello@packit.dev>
To: git-commits@fedoraproject.org
Subject: [rpms/podman] rawhide: Update to 6.0.0-rc1 upstream release
Date: Mon, 15 Jun 2026 15:12:56 GMT	[thread overview]
Message-ID: <178153637671.1.9437438024704435713.rpms-podman-bb50f506c76c@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/podman
            Branch : rawhide
            Commit : bb50f506c76c8c0812d6f6912948b02e7621b24f
            Author : Packit <hello@packit.dev>
            Date   : 2026-06-15T15:12:14+00:00
            Stats  : +81/-61 in 10 file(s)
            URL    : https://src.fedoraproject.org/rpms/podman/c/bb50f506c76c8c0812d6f6912948b02e7621b24f?branch=rawhide

            Log:
            Update to 6.0.0-rc1 upstream release

Upstream tag: v6.0.0-rc1
Upstream commit: d0c9bb1b

Commit authored by Packit automation (https://packit.dev/)

---
diff --git a/.gitignore b/.gitignore
index c348744..bf8ef54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1898,3 +1898,4 @@
 /v5.8.0.tar.gz
 /v5.8.1.tar.gz
 /v5.8.2.tar.gz
+/v6.0.0-rc1.tar.gz

diff --git a/.packit.yaml b/.packit.yaml
index 117c7b5..8171684 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -44,8 +44,8 @@ srpm_build_deps:
   - make
 
 actions:
-  fix-spec-file: "bash .packit-copr-rpm.sh"
-  pre-sync: "bash .packit-rpm-git-commit.sh"
+  fix-spec-file: "bash contrib/packit-tmt/packit-copr-rpm.sh"
+  pre-sync: "bash contrib/packit-tmt/packit-rpm-git-commit.sh"
 
 jobs:
   - job: copr_build
@@ -105,6 +105,11 @@ jobs:
     targets:
       - fedora-all
     tmt_plan: "/plans/system/*"
+    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
 
   - job: tests
     identifier: cockpit-revdeps
@@ -112,15 +117,18 @@ jobs:
     packages: [podman-fedora]
     notifications:
       failure_comment:
-        message: "Cockpit tests failed for commit {commit_sha}. @martinpitt, @jelly, @mvollmer please check."
+        message: "Cockpit tests failed for commit {commit_sha}. @jelly, @mvollmer please check."
     targets:
       - fedora-latest-stable
       - fedora-development
+    tmt_plan: "/plans/cockpit-podman"
     tf_extra_params:
       environments:
         - artifacts:
           - type: repository-file
             id: https://copr.fedorainfracloud.org/coprs/g/cockpit/main-builds/repo/fedora-$releasever/group_cockpit-main-builds-fedora-$releasever.repo
+          - type: repository-file
+            id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo
           tmt:
             context:
               revdeps: "yes"
@@ -134,17 +142,26 @@ jobs:
         message: "tmt tests failed for commit {commit_sha}. @lsm5, @psss, @thrix please check."
     targets:
       - fedora-latest
-    fmf_url: https://github.com/teemtee/tmt
-    fmf_path: /plans/friends
-    fmf_ref: main
-    tmt_plan: "/podman"
+    tmt_plan: "/plans/tmt"
+    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
+          tmt:
+            context:
+              revdeps: "yes"
 
+  # NOTE: Breaking changes related to Podman6 will only be shipped to Fedora
+  # Rawhide (to be Fedora 45) and newer.
+  # TODO: Update dist_git_branches as and when new Fedora releases are
+  # available.
   - job: propose_downstream
     trigger: release
     update_release: false
     packages: [podman-fedora]
     dist_git_branches: &fedora_targets
-      - fedora-all
+      - fedora-rawhide
 
   - job: koji_build
     trigger: commit

diff --git a/README.packit b/README.packit
index d0c48a2..4e76cbe 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.15.3.post1.dev2+g62cfd4cc2.
+The file was generated using packit 1.16.0.post1.dev8+g8a0482385.

diff --git a/plans/cockpit-podman.fmf b/plans/cockpit-podman.fmf
index 9485470..2e48335 100644
--- a/plans/cockpit-podman.fmf
+++ b/plans/cockpit-podman.fmf
@@ -1,6 +1,6 @@
 # reverse dependency test for https://github.com/cockpit-project/cockpit-podman/
 # packit should automatically notify the cockpit maintainers on failures.
-# For questions, please contact @martinpitt, @jelly, @mvollmer
+# For questions, please contact @jelly, @mvollmer
 enabled: false
 
 adjust+:
@@ -15,6 +15,12 @@ discover:
 execute:
     how: tmt
 
+prepare:
+    when: initiator == packit
+    how: shell
+    script: bash $TMT_TREE/contrib/packit-tmt/update-deps.sh
+    order: 20
+
 # not relevant for testing podman
 environment:
     TEST_AUDIT_NO_SELINUX: 1

diff --git a/plans/system.fmf b/plans/system.fmf
index b04c062..b5b2654 100644
--- a/plans/system.fmf
+++ b/plans/system.fmf
@@ -14,6 +14,10 @@ prepare:
         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: bash $TMT_TREE/contrib/packit-tmt/update-deps.sh
+      order: 20
 
 adjust+:
     - enabled: false
@@ -29,6 +33,26 @@ provision:
         disk:
             - size: ">= 512 GB"
 
+finish:
+    how: shell
+    script: |
+        # Archive logs to TMT_PLAN_DATA for post-test analysis
+        mkdir -p "$TMT_PLAN_DATA/logs"
+
+        # Copy audit logs (SELinux denials, audit events)
+        if [ -f /var/log/audit/audit.log ]; then
+            cp /var/log/audit/audit.log "$TMT_PLAN_DATA/logs/"
+            echo "Audit logs copied to $TMT_PLAN_DATA/logs/audit.log"
+        else
+            echo "No audit log found at /var/log/audit/audit.log"
+        fi
+
+        # Capture full journal (current boot only)
+        journalctl -b --no-pager --all --output=short-precise &> "$TMT_PLAN_DATA/logs/journal.log"
+        echo "Journal output saved to $TMT_PLAN_DATA/logs/journal.log"
+
+        echo "All logs archived to $TMT_PLAN_DATA/logs/"
+
 /local-root:
     summary: Local rootful tests
     discover+:

diff --git a/plans/tmt.fmf b/plans/tmt.fmf
index 1589b5c..55c7568 100644
--- a/plans/tmt.fmf
+++ b/plans/tmt.fmf
@@ -1,21 +1,24 @@
-summary: Run tmt container provision test (downstream only)
+# reverse dependency tests for https://github.com/teemtee/tmt/
+summary: Run podman tests
 
 enabled: false
 adjust+:
-    - enabled: true
-      when: initiator != packit and distro != rhel
+  when: revdeps == yes
+  enabled: true
 
 discover:
     how: fmf
-    filter: 'tag:tmt & tag:downstream'
-
-execute:
-    how: tmt
+    url: https://github.com/teemtee/tmt
+    filter: "tag:podman"
+    adjust-tests:
+      - check: avc
 
 prepare:
-    - when: distro == centos-stream or distro == rhel
+    - name: update-deps
+      when: initiator == packit
       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
+      script: bash $TMT_TREE/contrib/packit-tmt/update-deps.sh
+      order: 20
+
+execute:
+    how: tmt

diff --git a/podman.spec b/podman.spec
index c561ac7..81e2150 100644
--- a/podman.spec
+++ b/podman.spec
@@ -32,16 +32,12 @@
 %define fips_enabled 1
 %endif
 
-%global container_base_path github.com/containers
-%global container_base_url https://%{container_base_path}
+%global container_base_path go.podman.io
 
 # For LDFLAGS
-%global ld_project %{container_base_path}/%{name}/v5
+%global ld_project %{container_base_path}/%{name}/v6
 %global ld_libpod %{ld_project}/libpod
 
-# %%{name}
-%global git0 %{container_base_url}/%{name}
-
 # podman-machine subpackage will be present only on these architectures
 %global machine_arches x86_64 aarch64
 
@@ -63,7 +59,7 @@ Epoch: 5
 # 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: 5.8.2
+Version: 6.0.0~rc1
 # 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
@@ -75,7 +71,7 @@ ExclusiveArch: aarch64 ppc64le s390x x86_64 riscv64
 Summary: Manage Pods, Containers and Container Images
 URL: https://%{name}.io/
 # All SourceN files fetched from upstream
-Source0: %{git0}/archive/v%{version_no_tilde}.tar.gz
+Source0: https://github.com/containers/%{name}/archive/v%{version_no_tilde}.tar.gz
 Provides: %{name}-manpages = %{epoch}:%{version}-%{release}
 BuildRequires: %{_bindir}/envsubst
 %if %{defined build_with_btrfs}
@@ -104,14 +100,8 @@ BuildRequires: systemd
 BuildRequires: systemd-devel
 Requires: catatonit
 Requires: conmon >= 2:2.1.7-2
-%if %{defined fedora} && 0%{?fedora} >= 40
-# TODO: Remove the f40 conditional after a few releases to keep conditionals to
-# a minimum
-# Ref: https://bugzilla.redhat.com/show_bug.cgi?id=2269148
-Requires: containers-common-extra >= 5:0.58.0-1
-%else
-Requires: containers-common-extra
-%endif
+# Podman 6 requires the new config file layout.
+Requires: containers-common-extra >= 5:0.68.0
 %if %{defined sequoia}
 Requires: podman-sequoia
 %endif
@@ -161,7 +151,6 @@ Requires: nmap-ncat
 Requires: httpd-tools
 Requires: openssl
 Requires: socat
-Requires: slirp4netns
 Requires: buildah
 Requires: gnupg
 Requires: xfsprogs
@@ -254,7 +243,7 @@ LDFLAGS="-X %{ld_libpod}/define.buildInfo=${SOURCE_DATE_EPOCH:-$(date +%s)} \
 
 # This variable will be set by Packit actions. See .packit.yaml in the root dir
 # of the repo (upstream as well as Fedora dist-git).
-GIT_COMMIT="5b263b5f5b48004a87caac44e67349a8266d9ef4"
+GIT_COMMIT="d0c9bb1b49fb63826997342ad5ddb576bdf6e865"
 LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT"
 
 # build rootlessport first
@@ -352,12 +341,6 @@ ln -s ../qemu-kvm %{buildroot}%{_libexecdir}/%{name}/qemu-system-%{arch}
 %{_tmpfilesdir}/%{name}.conf
 %{_systemdgeneratordir}/%{name}-system-generator
 %{_systemdusergeneratordir}/%{name}-user-generator
-# iptables modules are only needed with iptables-legacy,
-# as of f41 netavark will default to nftables so do not load unessary modules
-# https://fedoraproject.org/wiki/Changes/NetavarkNftablesDefault
-%if %{defined fedora} && 0%{?fedora} < 41
-%{_modulesloaddir}/%{name}-iptables.conf
-%endif
 
 %files docker
 %{_bindir}/docker

diff --git a/sources b/sources
index 3a66756..feb767f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v5.8.2.tar.gz) = 4fb26b278aaaa64799c7cc27e168c6fd836a1ed95653c757db5de9873e774a4650353ad4aadad6a7968dd82db8e2833f871ba41304512825b706d4919ee333a7
+SHA512 (v6.0.0-rc1.tar.gz) = 8c7dcfbc1eb2eaa25fd56fd809e591ddfe38206e3f77682f2c5efd1c6f816c0cb128fd732279ab5cea432682bbf007a867732d9fafc6b139f2a895976497199d

diff --git a/test/tmt/system.sh b/test/tmt/system.sh
index 3cd29da..682d71d 100644
--- a/test/tmt/system.sh
+++ b/test/tmt/system.sh
@@ -19,7 +19,6 @@ rpm -q \
     podman \
     podman-tests \
     skopeo \
-    slirp4netns \
     systemd
 
 export system_service_cmd="/usr/bin/podman system service --timeout=0 &"

diff --git a/test/tmt/tmt.fmf b/test/tmt/tmt.fmf
deleted file mode 100644
index f016947..0000000
--- a/test/tmt/tmt.fmf
+++ /dev/null
@@ -1,13 +0,0 @@
-enabled: false
-adjust:
-    enabled: true
-    when: initiator != packit && distro != rhel
-summary: Make sure that TMT container provision works
-tag: [downstream]
-require:
-  - tmt+provision-container
-test:
-    tmt run --verbose --remove
-        provision --how container --image fedora
-        login --command 'cat /etc/os-release'
-        finish

                 reply	other threads:[~2026-06-15 15:12 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178153637671.1.9437438024704435713.rpms-podman-bb50f506c76c@fedoraproject.org \
    --to=hello@packit.dev \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox