From 941e5734949bb40979aeb722ef31f11e7aa21402 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 21 Aug 2023 13:58:57 +0000 Subject: [PATCH 01/20] [packit] 1.8.7 upstream release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream tag: 1.8.7 Upstream commit: 53a9996c If you need to do any change in this pull request, you need to locally fetch the source branch of it and push it (with a fix) to your fork (as it is not possible to push to the branch created in the Packit’s fork): ``` git fetch https://src.fedoraproject.org/forks/packit/rpms/crun.git refs/heads/*:refs/remotes/packit/* git checkout packit/1.8.7-f39-update-propose_downstream ``` --- .gitignore | 1 + .packit.yaml | 52 ++++++++++++++++++ README.packit | 3 ++ crun.spec | 142 ++++++++++++++++++++++++++++++-------------------- sources | 2 +- 5 files changed, 142 insertions(+), 58 deletions(-) create mode 100644 .packit.yaml create mode 100644 README.packit diff --git a/.gitignore b/.gitignore index 46feeb9..1949827 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ crun-0.1.1.tar.gz /crun-1.8.4.tar.xz /crun-1.8.5.tar.xz /crun-1.8.6.tar.xz +/crun-1.8.7.tar.xz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..fa87387 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,52 @@ +--- +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +specfile_path: rpm/crun.spec + +srpm_build_deps: + - git-archive-all + - make +actions: + create-archive: + - "git-archive-all -v --force-submodules rpm/crun-HEAD.tar.xz" + - bash -c "ls -1 rpm/crun-HEAD.tar.xz" + +jobs: + - job: copr_build + trigger: pull_request + # keep in sync with https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next + targets: + - fedora-all-x86_64 + - 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" + + # Run on commit to main branch + - job: copr_build + trigger: commit + branch: main + owner: rhcontainerbot + project: podman-next + + - job: propose_downstream + trigger: release + update_release: false + dist_git_branches: + - fedora-all + + - job: koji_build + trigger: commit + dist_git_branches: + - fedora-all + + - job: bodhi_update + trigger: commit + dist_git_branches: + - fedora-branched # rawhide updates are created automatically diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..797aefb --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.79.0.post2+g93f33d9. diff --git a/crun.spec b/crun.spec index 492a68d..26563aa 100644 --- a/crun.spec +++ b/crun.spec @@ -1,82 +1,126 @@ %global krun_opts %{nil} +%global wasmedge_opts %{nil} +%global wasmtime_opts %{nil} -%if 0%{?fedora} >= 37 +# krun and wasm[edge,time] support only on aarch64 and x86_64 %ifarch aarch64 || x86_64 -%global krun_support enabled +%global wasm_support 1 + +# wasmedge not present on Fedora ELN environments +%if !0%{?eln} +%global wasmedge_support 1 +%global wasmedge_opts --with-wasmedge +%endif + +# krun only exists on fedora +%if %{defined fedora} +%global krun_support 1 %global krun_opts --with-libkrun %endif + +# wasmtime exists only on podman-next copr for now +%if %{defined copr_project} && "%{?copr_project}" == "podman-next" +%global wasmtime_support 1 +%global wasmtime_opts --with-wasmtime %endif -%if 0%{?fedora} -# wasmedge built only for aarch64 and x86_64 -%ifarch aarch64 || x86_64 -%global wasm_support enabled -%global wasm_opts --with-wasmedge %endif -%endif - -%global built_tag 1.8.6 -%global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C Name: crun -Version: %{gen_version} +%if %{defined copr_username} +Epoch: 102 +%endif +# DO NOT TOUCH the Version string! +# The TRUE source of this specfile is: +# https://github.com/containers/crun/blob/main/rpm/crun.spec +# 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.8.7 +Release: %autorelease URL: https://github.com/containers/%{name} -# Fetched from upstream Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz License: GPL-2.0-only -Release: %autorelease +%if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} +%else +ExclusiveArch: aarch64 ppc64le riscv64 s390x x86_64 +%endif BuildRequires: autoconf BuildRequires: automake -BuildRequires: go-md2man -BuildRequires: libtool BuildRequires: gcc BuildRequires: git-core -BuildRequires: python3 +BuildRequires: gperf BuildRequires: libcap-devel -BuildRequires: systemd-devel -BuildRequires: yajl-devel -BuildRequires: libgcrypt-devel -%if "%{krun_support}" == "enabled" +%if %{defined krun_support} BuildRequires: libkrun-devel %endif -%if "%{wasm_support}" == "enabled" -BuildRequires: wasmedge-devel -%endif +BuildRequires: systemd-devel +BuildRequires: yajl-devel BuildRequires: libseccomp-devel -BuildRequires: libselinux-devel BuildRequires: python3-libmount -BuildRequires: make -BuildRequires: glibc-static +BuildRequires: libtool BuildRequires: protobuf-c-devel -%ifnarch %ix86 BuildRequires: criu-devel >= 3.17.1-2 -%endif Recommends: criu >= 3.17.1 Recommends: criu-libs +%if %{defined wasmedge_support} +BuildRequires: wasmedge-devel +%endif +%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 -%{name} is a runtime for running OCI containers +%{name} is a OCI runtime + +%if %{defined krun_support} +%package krun +Summary: %{name} with libkrun support +Requires: libkrun +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: krun = %{?epoch:%{epoch}:}%{version}-%{release} + +%description krun +krun is a symlink to the %{name} binary, with libkrun as an additional dependency. +%endif + +%if %{defined wasm_support} +%package wasm +Summary: %{name} with wasm support +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: wasm-library +Recommends: wasmedge + +%description wasm +%{name}-wasm is a symlink to the %{name} binary, with wasm as an additional dependency. +%endif %prep -%autosetup -Sgit %{name}-%{built_tag} +%autosetup -Sgit -n %{name}-%{version} %build ./autogen.sh -%configure --disable-silent-rules %{krun_opts} %{wasm_opts} +./configure --disable-silent-rules %{krun_opts} %{wasmedge_opts} %{wasmtime_opts} %make_build %install -%make_install +%make_install prefix=%{_prefix} rm -rf %{buildroot}%{_prefix}/lib* -%if "%{krun_support}" == "enabled" -ln -s ../bin/%{name} %{buildroot}%{_bindir}/krun + +%if %{defined krun_support} +ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/krun %endif -%if "%{wasm_support}" == "enabled" -ln -s ../bin/%{name} %{buildroot}%{_bindir}/%{name}-wasm +%if %{defined wasm_support} +ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-wasm %endif %files @@ -84,31 +128,15 @@ ln -s ../bin/%{name} %{buildroot}%{_bindir}/%{name}-wasm %{_bindir}/%{name} %{_mandir}/man1/* -%if "%{krun_support}" == "enabled" -%package krun -Summary: OCI Runtime providing Virtualization-based process isolation capabilities. -Provides: krun -Requires: %{name} = %{version}-%{release} -Requires: libkrun - -%description krun -%{name}-krun OCI Runtime providing Virtualization-based process isolation capabilities. - +%if %{defined krun_support} %files krun +%license COPYING %{_bindir}/krun %endif -%if "%{wasm_support}" == "enabled" -%package wasm -Summary: wasm support for %{name} -Requires: wasm-library -Recommends: wasmedge -Requires: %{name} = %{version}-%{release} - -%description wasm -%{name}-wasm provides %{name} built with wasm support - +%if %{defined wasm_support} %files wasm +%license COPYING %{_bindir}/%{name}-wasm %endif diff --git a/sources b/sources index 13f3791..45556df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.8.6.tar.xz) = d527b58ce4d5a7937260cc1336e10997595fed774e0faf4fed90e783de1ff4e3f036d800c7b92173f7fcad8bb1c0d6ee01989534d9b43eb0b937eef46a335f7d +SHA512 (crun-1.8.7.tar.xz) = 74d9f406de40512fa1694f9a744563c7a0eb217da700298da4afea065bd2181d818dd1d25098164eb3dacc47c149a45a57fd79445f40865ffcced383297491a4 From 4a75a8823b156a98fe5adc494bca25e478612476 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 7 Sep 2023 14:03:05 +0000 Subject: [PATCH 02/20] [packit] 1.9 upstream release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream tag: 1.9 Upstream commit: a538ac4e If you need to do any change in this pull request, you need to locally fetch the source branch of it and push it (with a fix) to your fork (as it is not possible to push to the branch created in the Packit’s fork): ``` git fetch https://src.fedoraproject.org/forks/packit/rpms/crun.git refs/heads/*:refs/remotes/packit/* git checkout packit/1.9-f39-update-propose_downstream ``` --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1949827..5f0563d 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ crun-0.1.1.tar.gz /crun-1.8.5.tar.xz /crun-1.8.6.tar.xz /crun-1.8.7.tar.xz +/crun-1.9.tar.xz diff --git a/README.packit b/README.packit index 797aefb..ea0650e 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.79.0.post2+g93f33d9. +The file was generated using packit 0.79.1.post14+g9e876412. diff --git a/crun.spec b/crun.spec index 26563aa..588db31 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ 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.8.7 +Version: 1.9 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index 45556df..438e926 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.8.7.tar.xz) = 74d9f406de40512fa1694f9a744563c7a0eb217da700298da4afea065bd2181d818dd1d25098164eb3dacc47c149a45a57fd79445f40865ffcced383297491a4 +SHA512 (crun-1.9.tar.xz) = 04777626873743d0f5d9d0c0338a37be03c786a4b57b95b83caba0a9ef5b64280194c4e7973fd6bb2a52a7aed458e2e76b4c638d1a9cf3e69ff7176d71037d23 From ca4d9f8128528c1712971b767fa8b1d9e32e60e5 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 26 Sep 2023 15:30:52 +0000 Subject: [PATCH 03/20] [packit] 1.9.1 upstream release Upstream tag: 1.9.1 Upstream commit: 1f2769e1 --- .gitignore | 1 + README.packit | 2 +- crun.spec | 5 +++-- sources | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5f0563d..69b0664 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ crun-0.1.1.tar.gz /crun-1.8.6.tar.xz /crun-1.8.7.tar.xz /crun-1.9.tar.xz +/crun-1.9.1.tar.xz diff --git a/README.packit b/README.packit index ea0650e..8b12de4 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.79.1.post14+g9e876412. +The file was generated using packit 0.81.0.post1.dev4+g3347ce2b. diff --git a/crun.spec b/crun.spec index 588db31..9b6e8f8 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ 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.9 +Version: 1.9.1 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz @@ -126,12 +126,13 @@ ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-wasm %files %license COPYING %{_bindir}/%{name} -%{_mandir}/man1/* +%{_mandir}/man1/crun.1 %if %{defined krun_support} %files krun %license COPYING %{_bindir}/krun +%{_mandir}/man1/krun.1 %endif %if %{defined wasm_support} diff --git a/sources b/sources index 438e926..6ea94e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.9.tar.xz) = 04777626873743d0f5d9d0c0338a37be03c786a4b57b95b83caba0a9ef5b64280194c4e7973fd6bb2a52a7aed458e2e76b4c638d1a9cf3e69ff7176d71037d23 +SHA512 (crun-1.9.1.tar.xz) = 5de6d16b2db3aaa5ec6fe9afc0df72eae5936fec2289fd31159ed81f39c73b8c61834ae587348ab76736394094333fdc0d7ecfa2002dd50f7430bf57627998f8 From c6d6c148d4cc0b21a91bd64f7fe48a2be6ca6bf5 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 26 Sep 2023 13:33:15 -0400 Subject: [PATCH 04/20] fix manpage installation (cherry picked from commit 8de06754f3b5c08ead3d5f6f3fc50882614c758e) --- crun.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crun.spec b/crun.spec index 9b6e8f8..2227a5c 100644 --- a/crun.spec +++ b/crun.spec @@ -126,13 +126,13 @@ ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-wasm %files %license COPYING %{_bindir}/%{name} -%{_mandir}/man1/crun.1 +%{_mandir}/man1/crun.1.gz %if %{defined krun_support} %files krun %license COPYING %{_bindir}/krun -%{_mandir}/man1/krun.1 +%{_mandir}/man1/krun.1.gz %endif %if %{defined wasm_support} From 1b88b4668fe7f03fd46ea1f5daf8317d214a2c89 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 26 Sep 2023 13:55:18 -0400 Subject: [PATCH 05/20] remove krun manpage if krun not supported (cherry picked from commit 612a96918ebaced4b9021a932b6a26e6e21c51d7) --- crun.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crun.spec b/crun.spec index 2227a5c..1b0f737 100644 --- a/crun.spec +++ b/crun.spec @@ -117,6 +117,8 @@ rm -rf %{buildroot}%{_prefix}/lib* %if %{defined krun_support} ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/krun +%else +rm -f %{buildroot}%{_mandir}/man1/krun.1 %endif %if %{defined wasm_support} From dc8ba1ef22dd3f705070588d0667b74ded62e4e9 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 27 Sep 2023 21:06:08 +0000 Subject: [PATCH 06/20] [packit] 1.9.2 upstream release Upstream tag: 1.9.2 Upstream commit: 35274d34 --- .gitignore | 1 + .packit.yaml | 7 ++++++- crun.spec | 6 ++---- sources | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 69b0664..2919216 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ crun-0.1.1.tar.gz /crun-1.8.7.tar.xz /crun-1.9.tar.xz /crun-1.9.1.tar.xz +/crun-1.9.2.tar.xz diff --git a/.packit.yaml b/.packit.yaml index fa87387..2cb0456 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -15,7 +15,9 @@ actions: jobs: - job: copr_build trigger: pull_request - # keep in sync with https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next + notifications: + failure_comment: + message: "Ephemeral COPR build failed. @containers/packit-build please check." targets: - fedora-all-x86_64 - fedora-all-aarch64 @@ -31,6 +33,9 @@ jobs: # Run on commit to main branch - job: copr_build trigger: commit + notifications: + failure_comment: + message: "podman-next COPR build failed. @containers/packit-build please check." branch: main owner: rhcontainerbot project: podman-next diff --git a/crun.spec b/crun.spec index 1b0f737..9c50b95 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ 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.9.1 +Version: 1.9.2 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz @@ -117,8 +117,6 @@ rm -rf %{buildroot}%{_prefix}/lib* %if %{defined krun_support} ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/krun -%else -rm -f %{buildroot}%{_mandir}/man1/krun.1 %endif %if %{defined wasm_support} @@ -128,7 +126,7 @@ ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-wasm %files %license COPYING %{_bindir}/%{name} -%{_mandir}/man1/crun.1.gz +%{_mandir}/man1/%{name}.1.gz %if %{defined krun_support} %files krun diff --git a/sources b/sources index 6ea94e0..d19d155 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.9.1.tar.xz) = 5de6d16b2db3aaa5ec6fe9afc0df72eae5936fec2289fd31159ed81f39c73b8c61834ae587348ab76736394094333fdc0d7ecfa2002dd50f7430bf57627998f8 +SHA512 (crun-1.9.2.tar.xz) = 277010c1057f5be2d75870685e539868f7289171ee607b15aab928ad9aeb176b17e6ab5a830495990307314b09791b7d2b93c2e731fd33dfd4cd9b5342db29f1 From 08fc4baedf15851f1026d30dda5369c323f67ae9 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 19 Oct 2023 10:13:12 +0000 Subject: [PATCH 07/20] [packit] 1.10 upstream release Upstream tag: 1.10 Upstream commit: c053c83c --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2919216..9832c0e 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,4 @@ crun-0.1.1.tar.gz /crun-1.9.tar.xz /crun-1.9.1.tar.xz /crun-1.9.2.tar.xz +/crun-1.10.tar.xz diff --git a/README.packit b/README.packit index 8b12de4..2a3acd4 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.81.0.post1.dev4+g3347ce2b. +The file was generated using packit 0.84.0. diff --git a/crun.spec b/crun.spec index 9c50b95..c71dde8 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ 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.9.2 +Version: 1.10 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index d19d155..b10aff9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.9.2.tar.xz) = 277010c1057f5be2d75870685e539868f7289171ee607b15aab928ad9aeb176b17e6ab5a830495990307314b09791b7d2b93c2e731fd33dfd4cd9b5342db29f1 +SHA512 (crun-1.10.tar.xz) = bf1e154869687f59eb3efd9eed6d37712842a8953088a340f3fb7c1d451db0dadb66eae7161c0ad6e2ec29749167cc1ff0815f722882b1fc95f7bee4f154e3f8 From ba69d677a60fad7be3667aeb5901017cc9cb7e6c Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 26 Oct 2023 20:20:39 +0000 Subject: [PATCH 08/20] [packit] 1.11 upstream release Upstream tag: 1.11 Upstream commit: 11f8d3dc --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9832c0e..536b469 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ crun-0.1.1.tar.gz /crun-1.9.1.tar.xz /crun-1.9.2.tar.xz /crun-1.10.tar.xz +/crun-1.11.tar.xz diff --git a/crun.spec b/crun.spec index c71dde8..4fb8604 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ 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.10 +Version: 1.11 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index b10aff9..ab948da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.10.tar.xz) = bf1e154869687f59eb3efd9eed6d37712842a8953088a340f3fb7c1d451db0dadb66eae7161c0ad6e2ec29749167cc1ff0815f722882b1fc95f7bee4f154e3f8 +SHA512 (crun-1.11.tar.xz) = b7a7af9d0cf27d966e37c6a8022f5628e4c90b446f39feab19b01e56c2396be078815716adf38d3ee8930890a24fdd2e501e462ee045e2734c7346e610f8ec7f From 87e4444b871513326012d42ca6566de8784ddf98 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 30 Oct 2023 20:25:36 +0000 Subject: [PATCH 09/20] [packit] 1.11.1 upstream release Upstream tag: 1.11.1 Upstream commit: 1084f952 --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 536b469..0aafa9d 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ crun-0.1.1.tar.gz /crun-1.9.2.tar.xz /crun-1.10.tar.xz /crun-1.11.tar.xz +/crun-1.11.1.tar.xz diff --git a/crun.spec b/crun.spec index 4fb8604..febfc18 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ 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.11 +Version: 1.11.1 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index ab948da..47b0f39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.11.tar.xz) = b7a7af9d0cf27d966e37c6a8022f5628e4c90b446f39feab19b01e56c2396be078815716adf38d3ee8930890a24fdd2e501e462ee045e2734c7346e610f8ec7f +SHA512 (crun-1.11.1.tar.xz) = c539b57f8419724dd6e9d3b7d0a3ed8d2f0d1e9089df66aa0a811fdf73ca72bc160424dea1cc597b0f98576e011b92eac39a62c7fddb67772ac5cf173c96e3fa From 204bbacad0100071b35a374afd25e13f0575ad05 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 7 Nov 2023 12:55:20 +0000 Subject: [PATCH 10/20] [packit] 1.11.2 upstream release Upstream tag: 1.11.2 Upstream commit: ab0edeef --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0aafa9d..82849e2 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ crun-0.1.1.tar.gz /crun-1.10.tar.xz /crun-1.11.tar.xz /crun-1.11.1.tar.xz +/crun-1.11.2.tar.xz diff --git a/README.packit b/README.packit index 2a3acd4..5998f60 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.84.0. +The file was generated using packit 0.85.0. diff --git a/crun.spec b/crun.spec index febfc18..e94dce0 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ 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.11.1 +Version: 1.11.2 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index 47b0f39..d382316 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.11.1.tar.xz) = c539b57f8419724dd6e9d3b7d0a3ed8d2f0d1e9089df66aa0a811fdf73ca72bc160424dea1cc597b0f98576e011b92eac39a62c7fddb67772ac5cf173c96e3fa +SHA512 (crun-1.11.2.tar.xz) = ae35ffb9bd1c7acebfd7f6236fa6a7ad524593d8f2cea1203f0e89023e9791d2d5bbc5c5cfc32ee5f18ad80662a1659076ab5f4d5ff74c6026842f2dd12be977 From ec5b2e7387ef7fc231c048dfabac97905d1fda28 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 23 Nov 2023 17:13:49 +0000 Subject: [PATCH 11/20] [packit] 1.12 upstream release Upstream tag: 1.12 Upstream commit: ce429cb2 --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 82849e2..039a846 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ crun-0.1.1.tar.gz /crun-1.11.tar.xz /crun-1.11.1.tar.xz /crun-1.11.2.tar.xz +/crun-1.12.tar.xz diff --git a/README.packit b/README.packit index 5998f60..d778d97 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.85.0. +The file was generated using packit 0.86.2.post1.dev2+g209847d1. diff --git a/crun.spec b/crun.spec index e94dce0..11589d5 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ 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.11.2 +Version: 1.12 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index d382316..a810830 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.11.2.tar.xz) = ae35ffb9bd1c7acebfd7f6236fa6a7ad524593d8f2cea1203f0e89023e9791d2d5bbc5c5cfc32ee5f18ad80662a1659076ab5f4d5ff74c6026842f2dd12be977 +SHA512 (crun-1.12.tar.xz) = 3ed4d2c2b27ea1b9c0c68762e2eff0f18ee9efcd401a9f7fc984459f1b593def2a353484c8c0c5967fb2aae11df446aca4353346f843e3a0298d2400721ee488 From 103b3fde3f2e35a52570d81777a85ecf611ab1f8 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 15 Jan 2024 16:26:05 +0000 Subject: [PATCH 12/20] [packit] 1.13 upstream release Upstream tag: 1.13 Upstream commit: c7613497 --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 039a846..d9d87fd 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ crun-0.1.1.tar.gz /crun-1.11.1.tar.xz /crun-1.11.2.tar.xz /crun-1.12.tar.xz +/crun-1.13.tar.xz diff --git a/README.packit b/README.packit index d778d97..8c508a5 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.86.2.post1.dev2+g209847d1. +The file was generated using packit 0.88.0. diff --git a/crun.spec b/crun.spec index 11589d5..3a47243 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ 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.12 +Version: 1.13 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index a810830..174b110 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.12.tar.xz) = 3ed4d2c2b27ea1b9c0c68762e2eff0f18ee9efcd401a9f7fc984459f1b593def2a353484c8c0c5967fb2aae11df446aca4353346f843e3a0298d2400721ee488 +SHA512 (crun-1.13.tar.xz) = 55e2a1cea019dfa3bf3c4c4ae369ecbd13f348a8056d83ca6b4ff4d0c76c841631e38ccdb314ff31e87e92c817bc994412dbca0dd73c20475322efcd2c748837 From 6247061f69756a5a257844ea01450df2483a465f Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 24 Jan 2024 16:54:43 +0000 Subject: [PATCH 13/20] [packit] 1.14 upstream release Upstream tag: 1.14 Upstream commit: 667e6ebd --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d9d87fd..cf3517d 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,4 @@ crun-0.1.1.tar.gz /crun-1.11.2.tar.xz /crun-1.12.tar.xz /crun-1.13.tar.xz +/crun-1.14.tar.xz diff --git a/README.packit b/README.packit index 8c508a5..bba9424 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.88.0. +The file was generated using packit 0.89.0.post1.dev4+gabf90471. diff --git a/crun.spec b/crun.spec index 3a47243..93dcbe3 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ 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.13 +Version: 1.14 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index 174b110..6ded306 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.13.tar.xz) = 55e2a1cea019dfa3bf3c4c4ae369ecbd13f348a8056d83ca6b4ff4d0c76c841631e38ccdb314ff31e87e92c817bc994412dbca0dd73c20475322efcd2c748837 +SHA512 (crun-1.14.tar.xz) = ec0dbbc6a0ad0f0beaf9384b2eda3b3d2ddbde1934f72312309cce9aeb38cf61937df7a5863a702e04251c511d6c5c56626e63b1f59a4c1cfeecd939f7c79f9d From 3b2b8aac8ccf02b31e284cdd8c07823cf7701214 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 8 Feb 2024 18:31:38 +0000 Subject: [PATCH 14/20] [packit] 1.14.1 upstream release Upstream tag: 1.14.1 Upstream commit: de537a79 --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cf3517d..b10d346 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,4 @@ crun-0.1.1.tar.gz /crun-1.12.tar.xz /crun-1.13.tar.xz /crun-1.14.tar.xz +/crun-1.14.1.tar.xz diff --git a/README.packit b/README.packit index bba9424..29cc7d8 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.89.0.post1.dev4+gabf90471. +The file was generated using packit 0.90.0.post1.dev9+g1f0325d1. diff --git a/crun.spec b/crun.spec index 93dcbe3..69fe6d4 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ 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 +Version: 1.14.1 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index 6ded306..21b134f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.14.tar.xz) = ec0dbbc6a0ad0f0beaf9384b2eda3b3d2ddbde1934f72312309cce9aeb38cf61937df7a5863a702e04251c511d6c5c56626e63b1f59a4c1cfeecd939f7c79f9d +SHA512 (crun-1.14.1.tar.xz) = 4a45941e8257b5180e30bcd5b40837c632261187508693002c02c33764bc8e031a3c9345d8a5e5989a5427c7f237595c457f1eb8cdc7967867976cc4abe6bc5a From 4afb4c89c73c5f8ea24e71a2c0040c6e9cadd072 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 16 Feb 2024 17:13:31 +0000 Subject: [PATCH 15/20] [packit] 1.14.2 upstream release Upstream tag: 1.14.2 Upstream commit: 32b139f7 --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b10d346..3db93c5 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,4 @@ crun-0.1.1.tar.gz /crun-1.13.tar.xz /crun-1.14.tar.xz /crun-1.14.1.tar.xz +/crun-1.14.2.tar.xz diff --git a/README.packit b/README.packit index 29cc7d8..f592284 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.91.0.post1.dev4+ge6fd4a25. diff --git a/crun.spec b/crun.spec index 69fe6d4..a883365 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ 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.1 +Version: 1.14.2 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index 21b134f..1a138f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.14.1.tar.xz) = 4a45941e8257b5180e30bcd5b40837c632261187508693002c02c33764bc8e031a3c9345d8a5e5989a5427c7f237595c457f1eb8cdc7967867976cc4abe6bc5a +SHA512 (crun-1.14.2.tar.xz) = 816598207da38bb172d974b3d45ec2bb1781c202163a409765475aa742e2545f3e9b31e358a6742f05391e0cd6a012e615532b63ba0f445fbb6edb6ae2d120d8 From d47b9dbca3bd0f2faf70e080afed035fe1d2376e Mon Sep 17 00:00:00 2001 From: Packit Date: Sat, 17 Feb 2024 08:35:15 +0000 Subject: [PATCH 16/20] [packit] 1.14.3 upstream release Upstream tag: 1.14.3 Upstream commit: 1961d211 --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3db93c5..8f10920 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ crun-0.1.1.tar.gz /crun-1.14.tar.xz /crun-1.14.1.tar.xz /crun-1.14.2.tar.xz +/crun-1.14.3.tar.xz diff --git a/crun.spec b/crun.spec index a883365..d48bda1 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ 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.2 +Version: 1.14.3 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index 1a138f6..c99de97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.14.2.tar.xz) = 816598207da38bb172d974b3d45ec2bb1781c202163a409765475aa742e2545f3e9b31e358a6742f05391e0cd6a012e615532b63ba0f445fbb6edb6ae2d120d8 +SHA512 (crun-1.14.3.tar.xz) = d6645c519ff00dda5def6d58240600d15e76969489918d51c0def2fee7dbad6374f83e5afc14a998d176aa2944765df5cd84c3031b265a1931ab23f2fc965fc1 From 66eb54dfc6adee9beabedba317cc327a6124c1c3 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 29 Feb 2024 17:45:48 +0000 Subject: [PATCH 17/20] [packit] 1.14.4 upstream release Upstream tag: 1.14.4 Upstream commit: a220ca66 --- .gitignore | 1 + README.packit | 2 +- crun.spec | 6 +++--- sources | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8f10920..5ac2073 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ crun-0.1.1.tar.gz /crun-1.14.1.tar.xz /crun-1.14.2.tar.xz /crun-1.14.3.tar.xz +/crun-1.14.4.tar.xz diff --git a/README.packit b/README.packit index f592284..31341b6 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.91.0.post1.dev4+ge6fd4a25. +The file was generated using packit 0.93.0. diff --git a/crun.spec b/crun.spec index d48bda1..1cf5209 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ 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.3 +Version: 1.14.4 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz @@ -116,11 +116,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 c99de97..f2ac790 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.14.3.tar.xz) = d6645c519ff00dda5def6d58240600d15e76969489918d51c0def2fee7dbad6374f83e5afc14a998d176aa2944765df5cd84c3031b265a1931ab23f2fc965fc1 +SHA512 (crun-1.14.4.tar.xz) = 1681ea85de3540958b4d7efadcf22c6f47c991fc4681a5028404952567c0b1b0220ad0ce0e0f0d727da27d8e63495a8bfc43a13b3511b1455106fdfec2e32e49 From a26f3eff3f0a54a60d32e3b123bd3118f0c50dac Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 2 May 2024 11:52:07 +0000 Subject: [PATCH 18/20] Update to 1.15 upstream release Upstream tag: 1.15 Upstream commit: e6eacaf4 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 89 ++++++++++++++++++++++++++++++++++++++++++++++----- README.packit | 2 +- crun.spec | 23 +++++++------ sources | 2 +- 5 files changed, 98 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 5ac2073..573ee2f 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,4 @@ crun-0.1.1.tar.gz /crun-1.14.2.tar.xz /crun-1.14.3.tar.xz /crun-1.14.4.tar.xz +/crun-1.15.tar.zst 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 31341b6..066b312 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.93.0. +The file was generated using packit 0.95.0.post1.dev8+gce6bd577. diff --git a/crun.spec b/crun.spec index 1cf5209..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 environments -%if !0%{?eln} +%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 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 From fe844b4c98461ee90df7e274a6703df2ed3a2d89 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 10 Sep 2024 15:49:12 +0530 Subject: [PATCH 19/20] bump to 1.17 (cherry picked from commit b8cbee4f4490433121376d2d0266221dc69d1016) --- .fmf/version | 1 + .gitignore | 1 + crun.spec | 42 +++++++++++---------------------------- gating.yaml | 12 +++++++++++ plans/main.fmf | 20 +++++++++++++++++++ sources | 2 +- tests/tmt/Makefile | 3 +++ tests/tmt/main.fmf | 13 ++++++++++++ tests/tmt/podman-tests.sh | 22 ++++++++++++++++++++ 9 files changed, 85 insertions(+), 31 deletions(-) create mode 100644 .fmf/version create mode 100644 gating.yaml create mode 100644 plans/main.fmf create mode 100644 tests/tmt/Makefile create mode 100644 tests/tmt/main.fmf create mode 100644 tests/tmt/podman-tests.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/.gitignore b/.gitignore index 573ee2f..578a718 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,4 @@ crun-0.1.1.tar.gz /crun-1.14.3.tar.xz /crun-1.14.4.tar.xz /crun-1.15.tar.zst +/crun-1.17.tar.zst diff --git a/crun.spec b/crun.spec index f8f06c4..f1869c0 100644 --- a/crun.spec +++ b/crun.spec @@ -1,16 +1,17 @@ %global krun_opts %{nil} %global wasmedge_opts %{nil} -%global wasmtime_opts %{nil} -# krun and wasm[edge,time] support only on aarch64 and x86_64 -%ifarch aarch64 || x86_64 -%global wasm_support 1 - -%if %{defined copr_project} +%if %{defined copr_username} %define copr_build 1 %endif -%if %{defined fedora} || %{defined copr_build} +# krun and wasm support only on aarch64 and x86_64 +%ifarch aarch64 || x86_64 + +# Disable wasmedge on rhel 10 until EPEL10 is in place, otherwise it causes +# build issues on copr +%if %{defined fedora} || (%{defined copr_build} && %{defined rhel} && 0%{?rhel} < 10) +%global wasm_support 1 %global wasmedge_support 1 %global wasmedge_opts --with-wasmedge %endif @@ -21,12 +22,6 @@ %global krun_opts --with-libkrun %endif -# wasmtime exists only on podman-next copr for now -%if %{defined copr_project} && "%{?copr_project}" == "podman-next" -%global wasmtime_support 1 -%global wasmtime_opts --with-wasmtime -%endif - %endif Summary: OCI runtime written in C @@ -40,7 +35,7 @@ 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.15 +Version: 1.17 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst @@ -71,9 +66,6 @@ Recommends: criu-libs %if %{defined wasmedge_support} BuildRequires: wasmedge-devel %endif -%if %{defined wasmtime_support} -BuildRequires: wasmtime-c-api-devel -%endif BuildRequires: python Provides: oci-runtime @@ -95,12 +87,10 @@ 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. +# wasm packages are not present on RHEL yet and are currently a PITA to test +# Best to only include wasmedge as weak dep on rhel %if %{defined fedora} Requires: wasm-library -%else -Recommends: wasm-library %endif Recommends: wasmedge @@ -113,21 +103,13 @@ Recommends: wasmedge %build ./autogen.sh -./configure --disable-silent-rules %{krun_opts} %{wasmedge_opts} %{wasmtime_opts} +./configure --disable-silent-rules %{krun_opts} %{wasmedge_opts} %make_build %install %make_install prefix=%{_prefix} rm -rf %{buildroot}%{_prefix}/lib* -%if %{defined krun_support} -ln -s %{name} %{buildroot}%{_bindir}/krun -%endif - -%if %{defined wasm_support} -ln -s %{name} %{buildroot}%{_bindir}/%{name}-wasm -%endif - %files %license COPYING %{_bindir}/%{name} diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..dbb1d91 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,12 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + +--- !Policy +product_versions: + - rhel-* +decision_context: osci_compose_gate +rules: [] diff --git a/plans/main.fmf b/plans/main.fmf new file mode 100644 index 0000000..b56d319 --- /dev/null +++ b/plans/main.fmf @@ -0,0 +1,20 @@ +discover: + how: fmf +execute: + how: tmt + +/upstream: + summary: Run crun specific Podman system tests on upstream PRs + discover+: + filter: tag:upstream + adjust+: + enabled: false + when: initiator is not defined or initiator != packit + +/downstream: + summary: Run crun specific Podman system tests on bodhi / errata and dist-git PRs + discover+: + filter: tag:downstream + adjust+: + enabled: false + when: initiator == packit diff --git a/sources b/sources index 7bf880b..6f53768 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.15.tar.zst) = a6e141f372817ed8ad1776c3ee272f68fa69680ef4d51b56643c0e4985016a5a6a415cc8623aa211c511916f2c61a417864c24c8d35fde594b624c666a9cca32 +SHA512 (crun-1.17.tar.zst) = 3e46241b10c72fc4139c1b0256d3dcd012ffa4ec3e7db752d0eb0497b95e722b9345b77210197e88c9543a1270612ba768b343d16a151ea8154167292b2f7b1c diff --git a/tests/tmt/Makefile b/tests/tmt/Makefile new file mode 100644 index 0000000..b57ba2c --- /dev/null +++ b/tests/tmt/Makefile @@ -0,0 +1,3 @@ +.PHONY: podman_system_test +podman_system_test: + bash ./podman-tests.sh diff --git a/tests/tmt/main.fmf b/tests/tmt/main.fmf new file mode 100644 index 0000000..b0db617 --- /dev/null +++ b/tests/tmt/main.fmf @@ -0,0 +1,13 @@ +# Only common dependencies that are NOT required to run podman-tests.sh are +# specified here. Everything else is in podman-tests.sh. +require: + - make + +adjust: + duration: 10m + when: arch == aarch64 + +/podman_system_test: + tag: [ upstream, downstream ] + summary: Run crun specific Podman tests + test: make podman_system_test diff --git a/tests/tmt/podman-tests.sh b/tests/tmt/podman-tests.sh new file mode 100644 index 0000000..9d091c7 --- /dev/null +++ b/tests/tmt/podman-tests.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +set -exo pipefail + +if [[ "$(id -u)" -ne 0 ]];then + echo "Please run this script as superuser" + exit 1 +fi + +# Remove testing-farm repos if they exist because they interfere with the +# podman-next copr. The default distro repos will not be removed and can be +# used wherever relevant. +rm -f /etc/yum.repos.d/tag-repository.repo + +dnf -y install bats conmon podman podman-tests +dnf -y update --allowerasing + +cat /etc/redhat-release +rpm -q conmon containers-common crun podman podman-tests + +# Run crun specific podman tests +bats /usr/share/podman/test/system/030-run.bats From 71fa027f8b9158783dda305bda00e7ac9fbf661e Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 22 Oct 2024 13:02:40 +0000 Subject: [PATCH 20/20] Update to 1.18 upstream release Upstream tag: 1.18 Upstream commit: 8656b254 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 106 ++++++++++++++++++++++++++++++++++---------------- README.packit | 2 +- crun.spec | 15 ++++++- sources | 2 +- 5 files changed, 88 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index 578a718..2aecac4 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,4 @@ crun-0.1.1.tar.gz /crun-1.14.4.tar.xz /crun-1.15.tar.zst /crun-1.17.tar.zst +/crun-1.18.tar.zst diff --git a/.packit.yaml b/.packit.yaml index 734d5a6..363614f 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -4,6 +4,24 @@ downstream_package_name: crun +# Ref: https://packit.dev/docs/configuration#files_to_sync +files_to_sync: + - src: rpm/gating.yaml + dest: gating.yaml + - src: plans/ + dest: plans/ + delete: true + mkpath: true + - src: tests/tmt/ + dest: tests/tmt/ + delete: true + mkpath: true + - src: .fmf/ + dest: .fmf/ + delete: true + mkpath: true + - .packit.yaml + packages: crun-fedora: pkg_tool: fedpkg @@ -11,6 +29,10 @@ packages: crun-centos: pkg_tool: centpkg specfile_path: rpm/crun.spec + crun-rhel: + specfile_path: rpm/crun.spec + crun-eln: + specfile_path: rpm/crun.spec srpm_build_deps: - git-archive-all @@ -29,9 +51,15 @@ 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 + + - job: copr_build + trigger: pull_request + packages: [crun-eln] + notifications: *copr_build_failure_notification + targets: - fedora-eln-x86_64 - fedora-eln-aarch64 @@ -39,17 +67,30 @@ jobs: trigger: pull_request packages: [crun-centos] notifications: *copr_build_failure_notification + targets: ¢os_targets + # Need epel9 repos to fetch wasmedge build dependency + centos-stream-9-x86_64: + additional_repos: + - https://dl.fedoraproject.org/pub/epel/9/Everything/x86_64/ + centos-stream-9-aarch64: + additional_repos: + - https://dl.fedoraproject.org/pub/epel/9/Everything/aarch64/ + # TODO: build on CS10 with wasmedge once epel-10 is available + centos-stream-10-x86_64: {} + centos-stream-10-aarch64: {} + + - job: copr_build + trigger: pull_request + packages: [crun-rhel] + 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 trigger: commit + packages: [crun-fedora] notifications: failure_comment: message: "podman-next COPR build failed. @containers/packit-build please check." @@ -64,31 +105,29 @@ jobs: 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" + targets: *fedora_copr_targets + 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 - # Podman system tests for Fedora and CentOS Stream + # Podman system tests for 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" + targets: *centos_targets + 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 # Podman system tests for RHEL - job: tests trigger: pull_request - packages: [crun-centos] + packages: [crun-rhel] use_internal_tf: true notifications: *podman_system_test_fail_notification targets: @@ -96,35 +135,34 @@ jobs: 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" + #TODO: Enable RHEL10 targets once epel-10 copr target is available + tf_extra_params: + environments: + - artifacts: + - type: repository-file + id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/epel-$releasever/rhcontainerbot-podman-next-epel-$releasever.repo + - type: repository-file + id: https://src.fedoraproject.org/rpms/epel-release/raw/epel9/f/epel.repo - job: propose_downstream trigger: release packages: [crun-fedora] - update_release: false - dist_git_branches: + dist_git_branches: &fedora_targets - 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: - - fedora-all + packages: [crun-fedora] + dist_git_branches: *fedora_targets - job: bodhi_update trigger: commit + packages: [crun-fedora] dist_git_branches: - fedora-branched # rawhide updates are created automatically diff --git a/README.packit b/README.packit index 066b312..2bd3f40 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.95.0.post1.dev8+gce6bd577. +The file was generated using packit 0.102.1.post1.dev6+g64f7460b. diff --git a/crun.spec b/crun.spec index f1869c0..1e315b8 100644 --- a/crun.spec +++ b/crun.spec @@ -1,5 +1,6 @@ %global krun_opts %{nil} %global wasmedge_opts %{nil} +%global yajl_opts %{nil} %if %{defined copr_username} %define copr_build 1 @@ -24,6 +25,12 @@ %endif +%if %{defined fedora} || (%{defined rhel} && 0%{?rhel} < 10) +%global system_yajl 1 +%else +%global yajl_opts --enable-embedded-yajl +%endif + Summary: OCI runtime written in C Name: crun %if %{defined copr_build} @@ -35,7 +42,7 @@ 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.17 +Version: 1.18 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst @@ -55,14 +62,18 @@ BuildRequires: libcap-devel BuildRequires: libkrun-devel %endif BuildRequires: systemd-devel +%if %{defined system_yajl} BuildRequires: yajl-devel +%endif BuildRequires: libseccomp-devel BuildRequires: python3-libmount BuildRequires: libtool BuildRequires: protobuf-c-devel +%ifnarch riscv64 BuildRequires: criu-devel >= 3.17.1-2 Recommends: criu >= 3.17.1 Recommends: criu-libs +%endif %if %{defined wasmedge_support} BuildRequires: wasmedge-devel %endif @@ -103,7 +114,7 @@ Recommends: wasmedge %build ./autogen.sh -./configure --disable-silent-rules %{krun_opts} %{wasmedge_opts} +./configure --disable-silent-rules %{krun_opts} %{wasmedge_opts} %{yajl_opts} %make_build %install diff --git a/sources b/sources index 6f53768..285c15f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.17.tar.zst) = 3e46241b10c72fc4139c1b0256d3dcd012ffa4ec3e7db752d0eb0497b95e722b9345b77210197e88c9543a1270612ba768b343d16a151ea8154167292b2f7b1c +SHA512 (crun-1.18.tar.zst) = a1a77a74163bcad18541c688e8006449c86ff490c98485c1294bdbf892840d1add1d5a25de75950a21255185aebdb6136490512d4c7562a53ac4052669924fad