Update to 1.42.2 upstream release

Upstream tag: v1.42.2
Upstream commit: c0cc9725

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

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -674,3 +674,64 @@
 /buildah-6d5d1ae.tar.gz
 /buildah-ec35bc4.tar.gz
 /v1.22.0.tar.gz
+/v1.23.0.tar.gz
+/v1.23.1.tar.gz
+/v1.23.2.tar.gz
+/v1.24.0.tar.gz
+/v1.24.1.tar.gz
+/v1.24.2.tar.gz
+/v1.25.0.tar.gz
+/v1.25.1.tar.gz
+/v1.26.0.tar.gz
+/v1.26.1.tar.gz
+/v1.26.2.tar.gz
+/v1.26.3.tar.gz
+/v1.26.4.tar.gz
+/v1.27.0.tar.gz
+/v1.27.1.tar.gz
+/v1.27.2.tar.gz
+/v1.28.0.tar.gz
+/v1.28.2.tar.gz
+/v1.29.0.tar.gz
+/v1.29.1.tar.gz
+/v1.30.0.tar.gz
+/v1.31.0.tar.gz
+/v1.31.1.tar.gz
+/v1.31.2.tar.gz
+/v1.31.3.tar.gz
+/v1.32.0.tar.gz
+/v1.32.1.tar.gz
+/v1.32.2.tar.gz
+/v1.33.2.tar.gz
+/v1.34.0.tar.gz
+/v1.34.1.tar.gz
+/v1.35.0.tar.gz
+/v1.35.1.tar.gz
+/v1.35.2.tar.gz
+/v1.35.3.tar.gz
+/v1.35.4.tar.gz
+/v1.36.0.tar.gz
+/v1.37.0.tar.gz
+/v1.37.1.tar.gz
+/v1.37.2.tar.gz
+/v1.37.3.tar.gz
+/v1.37.4.tar.gz
+/v1.37.5.tar.gz
+/v1.38.0.tar.gz
+/v1.38.1.tar.gz
+/v1.39.0.tar.gz
+/v1.39.1.tar.gz
+/v1.39.2.tar.gz
+/v1.39.3.tar.gz
+/v1.39.4.tar.gz
+/v1.40.0.tar.gz
+/v1.40.1.tar.gz
+/v1.41.0.tar.gz
+/v1.41.1.tar.gz
+/v1.41.2.tar.gz
+/v1.41.3.tar.gz
+/v1.41.4.tar.gz
+/v1.41.5.tar.gz
+/v1.42.0.tar.gz
+/v1.42.1.tar.gz
+/v1.42.2.tar.gz

.packit.yaml

@@ -0,0 +1,149 @@
+---
+# See the documentation for more information:
+# https://packit.dev/docs/configuration/
+
+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
+    specfile_path: rpm/buildah.spec
+  buildah-centos:
+    pkg_tool: centpkg
+    specfile_path: rpm/buildah.spec
+  buildah-eln:
+    specfile_path: rpm/buildah.spec
+
+srpm_build_deps:
+  - make
+
+jobs:
+  - job: copr_build
+    trigger: pull_request
+    packages: [buildah-fedora]
+    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
+      - 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: ignore
+    packages: [buildah-eln]
+    notifications: *copr_build_failure_notification
+    targets:
+      fedora-eln-x86_64:
+        additional_repos:
+          - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/"
+      fedora-eln-aarch64:
+        additional_repos:
+          - "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: ignore
+    packages: [buildah-centos]
+    notifications: *copr_build_failure_notification
+    targets: &centos_copr_targets
+      - centos-stream-9-x86_64
+      - centos-stream-9-aarch64
+      - centos-stream-10-x86_64
+      - centos-stream-10-aarch64
+    enable_net: true
+
+  # Run on commit to main branch
+  - job: copr_build
+    trigger: commit
+    packages: [buildah-fedora]
+    notifications:
+      failure_comment:
+        message: "podman-next COPR build failed. @containers/packit-build please check."
+    branch: main
+    owner: rhcontainerbot
+    project: podman-next
+    enable_net: true
+
+  # Tests on Fedora for main branch PRs
+  - job: tests
+    trigger: pull_request
+    packages: [buildah-fedora]
+    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: ignore
+    packages: [buildah-centos]
+    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
+    packages: [buildah-fedora]
+    update_release: false
+    dist_git_branches: &fedora_targets
+      - fedora-all
+
+  # Sync to CentOS Stream
+  - job: propose_downstream
+    trigger: release
+    packages: [buildah-centos]
+    update_release: false
+    dist_git_branches:
+      - c10s
+
+  # Fedora Koji build
+  - job: koji_build
+    trigger: commit
+    packages: [buildah-fedora]
+    sidetag_group: podman-releases
+    # Dependents are not rpm dependencies, but the package whose bodhi update
+    # should include this package.
+    # Ref: https://packit.dev/docs/fedora-releases-guide/releasing-multiple-packages
+    dependents:
+      - podman
+    dist_git_branches: *fedora_targets

README.packit

@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 1.12.0.post1.dev20+g7d30dac21.

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}

plans/main.fmf

@@ -0,0 +1,34 @@
+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"
+
+

sources

@@ -1 +1 @@
-SHA512 (v1.22.0.tar.gz) = 372ba3740f22af82aac07d51b48737168061a25d7d5ab1db63a381833211dd967aefb36f80cc97a4770a04d8b95a7fe9d3a892c091a82f85579e993b403b270b
+SHA512 (v1.42.2.tar.gz) = adb1de700db9b589639f6fd02cad95d9bedacb9d0363838315f33c978a8c900570d55af95073992ff69cff4f2a9d18776c5d786af294aaa1604144580c957414

tests/test_buildah.sh

@@ -1,66 +0,0 @@
-#!/bin/bash -e
-
-# Log program and kernel versions
-echo "Important package versions:"
-(
-    uname -r
-    rpm -qa | egrep 'buildah|podman|conmon|crun|runc|iptable|slirp|systemd' | 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
-
-###############################################################################
-# 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

tests/test_buildah.yml

@@ -1,17 +0,0 @@
----
-- hosts: localhost
-  environment:
-    TMPDIR: /var/tmp
-  roles:
-    - role: standard-test-basic
-      tags:
-        - classic
-        - container
-      required_packages:
-        - buildah
-        - buildah-tests
-      tests:
-        - root-test:
-            dir: ./
-            run: ./test_buildah.sh
-            timeout: 60m

tests/tests.yml

@@ -1 +0,0 @@
-- import_playbook: test_buildah.yml

tests/tmt/system.fmf

@@ -0,0 +1,24 @@
+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
+    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
+    duration: 60m

tests/tmt/system.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -exo pipefail
+
+uname -r
+
+rpm -q \
+    aardvark-dns \
+    buildah \
+    buildah-tests \
+    conmon \
+    container-selinux \
+    containers-common \
+    crun \
+    netavark \
+    systemd
+
+bats /usr/share/buildah/test/system