From da854f5de9abb32d9ca3dbd1510b7e45c00823a7 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Tue, 18 Mar 2025 12:21:02 +0100
Subject: [PATCH] crun-1.20-2.el10
- fix gating.yaml
- Related: RHEL-80817
Signed-off-by: Jindrich Novy <jnovy@redhat.com>
---
.packit.yaml | 130 --------------------------------------------------
README.packit | 3 --
crun.spec | 6 ++-
gating.yaml | 9 ----
4 files changed, 5 insertions(+), 143 deletions(-)
delete mode 100644 .packit.yaml
delete mode 100644 README.packit
diff --git a/.packit.yaml b/.packit.yaml
deleted file mode 100644
index 734d5a6..0000000
--- a/.packit.yaml
+++ /dev/null
@@ -1,130 +0,0 @@
----
-# See the documentation for more information:
-# https://packit.dev/docs/configuration/
-
-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"
-
-jobs:
- - job: copr_build
- trigger: pull_request
- packages: [crun-fedora]
- 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
- - fedora-eln-x86_64
- - fedora-eln-aarch64
-
- - 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
- trigger: commit
- notifications:
- failure_comment:
- message: "podman-next COPR build failed. @containers/packit-build please check."
- branch: main
- 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:
- - 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
deleted file mode 100644
index bee8d88..0000000
--- a/README.packit
+++ /dev/null
@@ -1,3 +0,0 @@
-This repository is maintained by packit.
-https://packit.dev/
-The file was generated using packit 0.95.0.
diff --git a/crun.spec b/crun.spec
index 6c2791c..a78cc16 100644
--- a/crun.spec
+++ b/crun.spec
@@ -43,7 +43,7 @@ Epoch: 102
# copr and koji builds.
# If you're reading this on dist-git, the version is automatically filled in by Packit.
Version: 1.20
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: https://github.com/containers/%{name}
Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst
License: GPL-2.0-only
@@ -140,6 +140,10 @@ rm -rf %{buildroot}%{_prefix}/lib*
%endif
%changelog
+* Tue Mar 18 2025 Jindrich Novy <jnovy@redhat.com> - 1.20-2
+- fix gating.yaml
+- Related: RHEL-80817
+
* Wed Feb 05 2025 Jindrich Novy <jnovy@redhat.com> - 1.20-1
- update to https://github.com/containers/crun/releases/tag/1.20
- Related: RHEL-58990
diff --git a/gating.yaml b/gating.yaml
index 4efb29f..2c7ed80 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,12 +1,3 @@
---- !Policy
-product_versions:
- - fedora-*
-decision_context:
- - bodhi_update_push_stable
- - bodhi_update_push_testing
-rules:
- - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
-
--- !Policy
product_versions:
- rhel-*