Compare commits

..

8 commits

Author SHA1 Message Date
Peter Hunt
e81341b68a bump to v1.26.3
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2023-04-10 15:18:05 -04:00
Peter Hunt
67bba2bf4f bump to v1.26.2
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2023-03-30 13:30:35 -04:00
Peter Hunt~
23ac9f5647 update for obs
Signed-off-by: Peter Hunt~ <pehunt@redhat.com>
2023-01-25 15:41:22 -05:00
Peter Hunt~
9090416e5a bump to v1.26.1
Signed-off-by: Peter Hunt~ <pehunt@redhat.com>
2023-01-11 10:08:26 -05:00
Peter Hunt~
3620e05ff2 bump to v1.26.0
Signed-off-by: Peter Hunt~ <pehunt@redhat.com>
2022-12-23 00:39:28 -05:00
Peter Hunt~
95608464be bump to v1.25.1
Signed-off-by: Peter Hunt~ <pehunt@redhat.com>
2022-10-07 13:33:02 -04:00
Peter Hunt~
b7d19f6456 bump golang version
Signed-off-by: Peter Hunt~ <pehunt@redhat.com>
2022-08-29 14:29:20 -04:00
Peter Hunt~
17732e0eb2 bump to v1.25.0
Signed-off-by: Peter Hunt~ <pehunt@redhat.com>
2022-08-29 14:23:58 -04:00
6 changed files with 38 additions and 224 deletions

53
.gitignore vendored
View file

@ -1,49 +1,6 @@
/cri-o-441bd3d.tar.gz
/cri-o-3eac3b2.tar.gz
/cri-o-4fbb022.tar.gz
/cri-o-e0c89d8.tar.gz
/cri-o-71cc465.tar.gz
/cri-o-774a29e.tar.gz
/cri-o-18bc811.tar.gz
/cri-o-e8a2525.tar.gz
/cri-o-d70609a.tar.gz
/cri-o-b7644f6.tar.gz
/cri-o-485227d.tar.gz
/cri-o-f0827bb.tar.gz
/cri-o-b731670.tar.gz
/cri-o-6a4b481.tar.gz
/cri-o-a783f23.tar.gz
/cri-o-bf8fcf3.tar.gz
/cri-o-cd4b6ae.tar.gz
/cri-o-b89a5fc.tar.gz
/cri-o-6d0ffae.tar.gz
/cri-o-ee2de87.tar.gz
/v1.17.1.tar.gz
/v1.17.2.tar.gz
/v1.18.0-rc1.tar.gz
/v1.18.0.tar.gz
/v1.18.1.tar.gz
/v1.18.2.tar.gz
/v1.18.3.tar.gz
/v1.19.0.tar.gz
/v1.20.0.tar.gz
/v1.20.1.tar.gz
/v1.20.2.tar.gz
/cri-o-1.21.1.tar.gz
/cri-o-1.21.2.tar.gz
/cri-o-1.22.0.tar.gz
/cri-o-1.22.1.tar.gz
/cri-o-1.23.0.tar.gz
/cri-o-1.23.1.tar.gz
/cri-o-1.23.2.tar.gz
/cri-o-1.24.1.tar.gz
/cri-o-1.25.0.tar.gz
/cri-o-1.25.1.tar.gz
/cri-o-1.26.0.tar.gz
/cri-o-1.26.1.tar.gz
/cri-o-1.27.0.tar.gz
/cri-o-1.27.1.tar.gz
/cri-o-1.28.0.tar.gz
/cri-o-1.28.2.tar.gz
/cri-o-1.29.2.tar.gz
/cri-o-1.29.3.tar.gz
/cri-o-1.29.4.tar.gz
/cri-o-1.31.1.tar.gz
/cri-o-1.32.0.tar.gz
/cri-o-1.26.2.tar.gz
/cri-o-1.26.3.tar.gz

View file

@ -1,13 +1,6 @@
# https://github.com/cri-o/cri-o
%global goipath github.com/cri-o/cri-o
%global service_name crio
# Related: github.com/cri-o/cri-o/issues/3684
%global build_timestamp %(date -u +'%Y-%m-%dT%H:%M:%SZ')
%global git_tree_state clean
%global criocli_path ""
Version: 1.32.0
Version: 1.26.3
%if 0%{?rhel} && 0%{?rhel} <= 9
%define gobuild(o:) %{expand:
@ -25,22 +18,36 @@ Version: 1.32.0
%bcond_without check
%endif
# Related: github.com/cri-o/cri-o/issues/3684
%global build_timestamp %(date -u +'%Y-%m-%dT%H:%M:%SZ')
%global git_tree_state clean
%global criocli_path ""
# Used for comparing with latest upstream tag
# to decide whether to autobuild (non-rawhide only)
%global built_tag v%{version}
%global built_tag_strip %(b=%{built_tag}; echo ${b:1})
%global crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.')
# Services
%global service_name crio
# Commit for the builds
%global commit0 b7f3c240bcbda6fae8d43561694d18317e09e167
%global commit0 afec31f8173b63dd189911deff7dcef5d01621f8
Name: cri-o
Epoch: 0
Release: 5%{?dist}
Release: 1%{?dist}
Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface
# Upstream license specification: Apache-2.0
# Automatically converted from old format: ASL 2.0 - review is highly recommended.
License: Apache-2.0
License: ASL 2.0
URL: https://github.com/cri-o/cri-o
Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz
%if 0%{?rhel}
BuildRequires: golang >= 1.23
BuildRequires: golang >= 1.19
%endif
%if 0%{?rhel} && 0%{?rhel} <= 8
# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
@ -104,16 +111,14 @@ sed -i 's/\/local//' contrib/systemd/%{service_name}.service
sed -i 's/\/local//' contrib/systemd/%{service_name}-wipe.service
%build
%global __golang_extldflags -Wl,-z,undefs
export GO111MODULE=on
export GOFLAGS=-mod=vendor
export BUILDTAGS="containers_image_ostree_stub
$(hack/btrfs_installed_tag.sh)
$(hack/btrfs_tag.sh) $(hack/openpgp_tag.sh)
$(hack/seccomp_tag.sh) $(hack/selinux_tag.sh)
$(hack/libsubid_tag.sh) exclude_graphdriver_devicemapper"
export BUILDTAGS="$(hack/btrfs_installed_tag.sh)
$(hack/btrfs_tag.sh) $(hack/libdm_installed.sh)
$(hack/libdm_no_deferred_remove_tag.sh)
$(hack/seccomp_tag.sh)
$(hack/selinux_tag.sh)"
%if 0%{?rhel} && 0%{?rhel} <= 8
BUILDTAGS="$BUILDTAGS containers_image_openpgp"
@ -194,10 +199,11 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf
%systemd_postun_with_restart %{service_name}
%files
%license LICENSE vendor/modules.txt
%license LICENSE
%doc docs code-of-conduct.md tutorial.md ADOPTERS.md CONTRIBUTING.md README.md
%doc awesome.md transfer.md
%{_bindir}/%{service_name}
%{_bindir}/%{service_name}-status
%{_bindir}/pinns
%{_mandir}/man5/%{service_name}.conf*5*
%{_mandir}/man8/%{service_name}*.8*
@ -224,70 +230,11 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf
%endif
%changelog
* Fri Oct 10 2025 Alejandro Sáez <asm@redhat.com> - 0:1.32.0-5
- rebuild
* Mon Apr 10 2023 Peter Hunt <pehunt@redhat.com> - 0:1.26.3-1
- bump to v1.26.3
* Fri Aug 15 2025 Maxwell G <maxwell@gtmx.me> - 0:1.32.0-4
- Rebuild for golang-1.25.0
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.32.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.32.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Mon Dec 23 2024 Bradley G Smith <bradley.g.smith@gmail.com> - 0:1.32.0-1
- Bump to v1.32.0
- Add -Wl,-z,undefs linker flags to resolve https://github.com/cri-o/cri-o/issues/8860
- Update BUILDTAGS to conform to upstream
* Thu Oct 24 2024 Dennis Gilmore <dennis@ausil.us> - 0:1.31.1-1
- update to 1.31.1
* Wed Jul 24 2024 Miroslav Suchý <msuchy@redhat.com> - 0:1.29.4-3
- convert license to SPDX
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.29.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Tue Apr 30 2024 Bradley G Smith <bradley.g.smith@gmail.com> - 0:1.29.4-1
- Bump to v1.29.4
- Resolves CVE-2024-3154, a security flaw where CRI-O allowed users to specify annotations that changed specific fields in the runtime.
* Sat Apr 27 2024 Bradley G Smith <bradley.g.smith@gmail.com> - 0:1.29.3-1
- Bump to v1.29.3
- Add support for autogenerated bundled provides
- Remove otelttrpc patch added in v1.29.2 to fix rpm build error. No longer needed.
* Thu Mar 21 2024 Peter Hunt <pehunt@redhat.com> - 0:1.29.2-1
- bump to v1.29.2
* Sun Feb 11 2024 Maxwell G <maxwell@gtmx.me> - 0:1.28.2-5
- Rebuild for golang 1.22.0
* Sun Feb 11 2024 Maxwell G <maxwell@gtmx.me> - 0:1.28.2-4
- Rebuild for golang 1.22.0
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.28.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.28.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Dec 04 2023 Christian Glombek <cglombek@redhat.com> - 0:1.28.2-1
- bump to v1.28.2
* Thu Aug 24 2023 Peter Hunt <pehunt@redhat.com> - 0:1.28.0-1
- bump to v1.28.0
* Thu Jul 20 2023 T K Chandra Hasan <t.k.chandra.hasan@ibm.com> - 0:1.27.1-1
- bump to v1.27.1
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.27.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Apr 25 2023 Peter Hunt <pehunt@redhat.com> - 0:1.27.0-1
- bump to v1.27.0
* Thu Mar 30 2023 Peter Hunt <pehunt@redhat.com> - 0:1.26.2-1
- bump to v1.26.2
* Wed Jan 25 2023 Peter Hunt~ <pehunt@redhat.com> - 0:1.26.1-2
- update for obs
@ -665,7 +612,7 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf
- Configurable image volume support
- Bugs and Stability fixes
- OCI 1.0 runtime support
- Dropped internal runc, and now use systems runc
- Dropped internal runc, and now use systems runc
* Fri Jun 30 2017 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.0.alpha.0-1.git91977d3
- built commit 91977d3

View file

@ -1 +1 @@
SHA512 (cri-o-1.32.0.tar.gz) = 800091f74a3176edfee207cdb85b207913d9433d3d6fa5f5ba971d026fd5d5a5daaee646cb8f983bceea5c4f75cb75a0093ae835b77cca2567de00819d400f96
SHA512 (cri-o-1.26.3.tar.gz) = fb069579d08dd3cc1459578424b8e948c32be7165179c65c0bb86dbeda4d9bfc0897729a6522c5b1e0a4d0896c1984577b05590a23d0aa1b938e745efbbbce8f

View file

@ -1,53 +0,0 @@
#!/bin/bash
#
# Simple wrapper for cri-o tests
#
set -x
exec >/tmp/test.debug.log 2>&1
echo "************************************************************************"
echo "* This log contains the output from test_crio.sh."
echo "*"
echo "* It is almost certainly not what you want. What you want is"
echo "* probably test.full.log , which is the output of test_runner.sh ,"
echo "* the actual cri-o tests."
echo "************************************************************************"
rm -f /tmp/test.log /tmp/test.full.log
cd /usr/share/cri-o/test
# Gah
cp --force redhat_sigstore.yaml \
/etc/containers/registries.d/registry.access.redhat.com.yaml
export CRIO_CNI_PLUGIN=/usr/libexec/cni
export PAUSE_BINARY=/usr/libexec/crio/pause
export CRIO_BINARY=/usr/bin/crio
export CONMON_BINARY=/usr/libexec/crio/conmon
export SECCOMP_PROFILE=/etc/crio/seccomp.json
./test_runner.sh &> /tmp/test.full.log
status=$?
# Sample output from cri-tests:
#
# not ok 35 ctr update resources
# ok 84 pod stop idempotent with ctrs already stopped
# ok 86 # skip (need systemd cgroup manager) invalid systemd cgroup_parent
#
# convert those to:
#
# FAIL 35 ctr ...
# PASS 84 pod stop ...
#
sed -n \
-e 's/^ok /PASS /p' \
-e 's/^not ok /FAIL /p' \
</tmp/test.full.log \
>/tmp/test.log
exit $status

View file

@ -1,36 +0,0 @@
---
- hosts: localhost
vars:
- artifacts: ./artifacts
tags:
- classic
- container
# - atomic
tasks:
- name: install integration tests
dnf: name={{ item }} state=present enablerepo=updates-testing
with_items:
- cri-o
- cri-o-integration-tests
- cri-tools
- nmap-ncat
- socat
- containernetworking-cni
- conntrack-tools
- python2
- bats
- block:
- name: Run test
script: ./test_crio.sh
always:
- name: Pull out logs
fetch:
src: "/tmp/{{ item }}"
dest: "{{ artifacts }}/{{ item }}"
flat: yes
with_items:
- test.log
- test.debug.log
- test.full.log

View file

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