diff --git a/.packit.yaml b/.packit.yaml index 2cb0456..734d5a6 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -2,12 +2,22 @@ # See the documentation for more information: # https://packit.dev/docs/configuration/ -specfile_path: rpm/crun.spec +downstream_package_name: crun + +packages: + crun-fedora: + pkg_tool: fedpkg + specfile_path: rpm/crun.spec + crun-centos: + pkg_tool: centpkg + specfile_path: rpm/crun.spec srpm_build_deps: - git-archive-all - make + actions: + # This action runs only on copr build jobs create-archive: - "git-archive-all -v --force-submodules rpm/crun-HEAD.tar.xz" - bash -c "ls -1 rpm/crun-HEAD.tar.xz" @@ -15,7 +25,8 @@ actions: jobs: - job: copr_build trigger: pull_request - notifications: + packages: [crun-fedora] + notifications: &copr_build_failure_notification failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." targets: @@ -23,12 +34,18 @@ jobs: - fedora-all-aarch64 - fedora-eln-x86_64 - fedora-eln-aarch64 - - centos-stream+epel-next-8-x86_64 - - centos-stream+epel-next-8-aarch64 - - centos-stream+epel-next-9-x86_64 - - centos-stream+epel-next-9-aarch64 - additional_repos: - - "copr://rhcontainerbot/podman-next" + + - job: copr_build + trigger: pull_request + packages: [crun-centos] + notifications: *copr_build_failure_notification + targets: + - epel-9-x86_64 + - epel-9-aarch64 + - centos-stream-9-x86_64 + - centos-stream-9-aarch64 + - centos-stream-10-x86_64 + - centos-stream-10-aarch64 # Run on commit to main branch - job: copr_build @@ -40,12 +57,68 @@ jobs: owner: rhcontainerbot project: podman-next + # Podman system tests for Fedora and CentOS Stream + - job: tests + trigger: pull_request + packages: [crun-fedora] + notifications: &podman_system_test_fail_notification + failure_comment: + message: "podman system tests failed. @containers/packit-build please check." + targets: + - fedora-all-x86_64 + - fedora-all-aarch64 + identifier: podman_system_test_fedora + tmt_plan: "/plans/podman_system_test" + + # Podman system tests for Fedora and CentOS Stream + - job: tests + trigger: pull_request + packages: [crun-centos] + notifications: *podman_system_test_fail_notification + targets: + - centos-stream-9-x86_64 + - centos-stream-9-aarch64 + # TODO: Enable cs10 tests after netavark has finished defaulting to + # nftables + #- centos-stream-10-x86_64 + #- centos-stream-10-aarch64 + identifier: podman_system_test_centos + tmt_plan: "/plans/podman_system_test" + + # Podman system tests for RHEL + - job: tests + trigger: pull_request + packages: [crun-centos] + use_internal_tf: true + notifications: *podman_system_test_fail_notification + targets: + epel-9-x86_64: + distros: [RHEL-9.4.0-Nightly,RHEL-9-Nightly] + epel-9-aarch64: + distros: [RHEL-9.4.0-Nightly,RHEL-9-Nightly] + # TODO: Enable cs10 tests after netavark has finished defaulting to + # nftables + #centos-stream-10-x86_64: + # distros: [RHEL-10-Beta-Nightly] + #centos-stream-10-aarch64: + # distros: [RHEL-10-Beta-Nightly] + identifier: podman_system_test_internal + tmt_plan: "/plans/podman_system_test" + - job: propose_downstream trigger: release + packages: [crun-fedora] update_release: false dist_git_branches: - fedora-all + - job: propose_downstream + trigger: release + packages: [crun-centos] + update_release: false + dist_git_branches: + - c10s + - job: koji_build trigger: commit dist_git_branches: diff --git a/README.packit b/README.packit index 29cc7d8..bee8d88 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 0.90.0.post1.dev9+g1f0325d1. +The file was generated using packit 0.95.0. diff --git a/crun.spec b/crun.spec index d575d96..f8f06c4 100644 --- a/crun.spec +++ b/crun.spec @@ -6,8 +6,11 @@ %ifarch aarch64 || x86_64 %global wasm_support 1 -# wasmedge not present on Fedora ELN / RHEL environments -%if !0%{?rhel} +%if %{defined copr_project} +%define copr_build 1 +%endif + +%if %{defined fedora} || %{defined copr_build} %global wasmedge_support 1 %global wasmedge_opts --with-wasmedge %endif @@ -28,7 +31,7 @@ Summary: OCI runtime written in C Name: crun -%if %{defined copr_username} +%if %{defined copr_build} Epoch: 102 %endif # DO NOT TOUCH the Version string! @@ -37,10 +40,10 @@ Epoch: 102 # 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.14.4 +Version: 1.15 Release: %autorelease URL: https://github.com/containers/%{name} -Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz +Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst License: GPL-2.0-only %if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} @@ -71,11 +74,7 @@ BuildRequires: wasmedge-devel %if %{defined wasmtime_support} BuildRequires: wasmtime-c-api-devel %endif -%if %{defined rhel} && 0%{?rhel} == 8 -BuildRequires: python3 -%else BuildRequires: python -%endif Provides: oci-runtime %description @@ -96,7 +95,13 @@ krun is a symlink to the %{name} binary, with libkrun as an additional dependenc %package wasm Summary: %{name} with wasm support Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +# The hard dep on wasm-library is causing trouble in internal testing farm +# with RHEL. +%if %{defined fedora} Requires: wasm-library +%else +Recommends: wasm-library +%endif Recommends: wasmedge %description wasm @@ -116,11 +121,11 @@ Recommends: wasmedge rm -rf %{buildroot}%{_prefix}/lib* %if %{defined krun_support} -ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/krun +ln -s %{name} %{buildroot}%{_bindir}/krun %endif %if %{defined wasm_support} -ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-wasm +ln -s %{name} %{buildroot}%{_bindir}/%{name}-wasm %endif %files diff --git a/sources b/sources index f2ac790..7bf880b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.14.4.tar.xz) = 1681ea85de3540958b4d7efadcf22c6f47c991fc4681a5028404952567c0b1b0220ad0ce0e0f0d727da27d8e63495a8bfc43a13b3511b1455106fdfec2e32e49 +SHA512 (crun-1.15.tar.zst) = a6e141f372817ed8ad1776c3ee272f68fa69680ef4d51b56643c0e4985016a5a6a415cc8623aa211c511916f2c61a417864c24c8d35fde594b624c666a9cca32