Compare commits

...
Sign in to create a new pull request.

108 commits

Author SHA1 Message Date
Peter Hunt
647f9e858c drop check section
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2022-03-24 10:11:49 -04:00
Peter Hunt
5b9f8dc01a rebuild
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2022-03-23 14:26:46 -04:00
Peter Hunt
bf2fcccf53 bump to v1.21.6
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2022-03-15 13:43:33 -04:00
Peter Hunt
d60cefdf28 bump to v1.21.5
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2022-03-10 15:36:51 -05:00
Peter Hunt
563680d4aa fix bogus date
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2021-12-06 11:46:46 -05:00
Peter Hunt
a922af92a6 bump to v1.21.4
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2021-11-11 14:55:58 -05:00
Timothée Ravier
5115b6a25d Remove source tarballs and update gitignore 2021-09-22 19:14:38 +02:00
Peter Hunt
49614df391 update sources for 1.21.3
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2021-09-16 15:19:50 -04:00
Peter Hunt
01b4928921 bump to v1.21.3
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2021-09-15 15:55:27 -04:00
Peter Hunt
52d2724247 Revert "drop sysconfig files"
This reverts commit 6b3f2c452a.

Signed-off-by: Peter Hunt <pehunt@redhat.com>
2021-08-18 11:34:52 -04:00
Peter Hunt
6b3f2c452a drop sysconfig files
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2021-08-18 11:18:49 -04:00
Peter Hunt
430619cdef more fedora fixes
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2021-08-10 15:23:57 -04:00
Peter Hunt
243ea09a82 bump to v1.21.2
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2021-07-20 11:33:18 -04:00
Peter Hunt
78e49f0320 bump to v1.21.1
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2021-07-19 15:49:22 -04:00
Peter Hunt
67a44090fd include commit0
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2021-06-24 12:42:46 -04:00
Peter Hunt
35c1f38c66 finish update for fedora
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2021-06-23 11:15:22 -04:00
Peter Hunt
5b6dcb3b19 update to better meet fedora standards
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2021-06-22 16:45:17 -04:00
Peter Hunt
cf43d586a2 fix FORTIFY_SOURCE
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2021-04-30 09:43:14 -04:00
Peter Hunt
5fd11b8bea fix enable metrics
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2021-04-14 19:15:22 -04:00
Peter Hunt
d1577b02a7 Use crio config instead of metrics sysconfig
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2021-04-14 15:26:45 -04:00
Peter Hunt
e0286d5b5a bump to v1.21.0
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2021-04-14 14:33:24 -04:00
Peter Hunt
f54ce04bf2 Bump to v1.20.2
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2021-03-24 09:57:31 -04:00
Peter Hunt
812cd9a04c update for centos stream
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2021-03-22 15:39:35 -04:00
Peter Hunt
a12b425c71 Bump to v1.20.1
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2021-03-12 14:54:58 -05:00
Peter Hunt
5d65cec858 Keep metacopy for fedora
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2021-02-15 10:58:42 -05:00
Peter Hunt
eefca2327b some small fixes to sysctl
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2021-01-12 10:36:53 -05:00
Peter Hunt
d6b8dcd417 add fs.may_detatch_mounts sysctl for centos/rhel 7
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2021-01-12 09:56:35 -05:00
Peter Hunt
5f90bf7d96 Fix checksec for pinns
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2020-12-17 11:17:08 -05:00
Peter Hunt
3aef561fce enable PIE mode for cri-o
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2020-12-16 17:18:47 -05:00
Peter Hunt
15992629e3 update cri-o time stamp
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2020-12-16 11:35:45 -05:00
Peter Hunt
cb937c198d Bump to v1.20.0
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2020-12-11 12:25:47 -05:00
Peter Hunt
8b14baa9ad fix timestamp
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2020-11-19 10:17:51 -05:00
Peter Hunt
afa6de5707 upsream#3879: fix symbolic link
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2020-11-09 15:05:00 -05:00
Peter Hunt
614521f1a8 update spec to handle OBS
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2020-10-23 12:19:14 -04:00
Peter Hunt
ac878a9dee update go-md2man dependency to handle OBS
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2020-10-05 12:19:15 -04:00
Peter Hunt
82578d3792 fix rpm for centos 7
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2020-09-17 16:49:20 -04:00
Peter Hunt
2934c3a2a6 bump to v1.19.0
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2020-09-14 17:15:56 -04:00
Peter Hunt
9940981c18 Github 3923: Make runc installation recommended
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2020-08-03 21:00:57 -04:00
Peter Hunt
cbdc64b934 Bump to v1.8.3
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2020-07-28 22:22:03 -04:00
Peter Hunt
38c00abc4b remove custom conmon path
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2020-07-28 22:02:57 -04:00
Douglas Schilling Landgraf
85d5d87288 1.18.2
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
2020-06-29 13:38:21 -04:00
Douglas Schilling Landgraf
daa68da0da new spec changes for 1.18.2 2020-06-23 11:31:19 -04:00
Douglas Schilling Landgraf
30ddefa831 spec: add new dir for --cni-plugin-dir /opt/cni/bin 2020-06-05 20:07:36 -04:00
Douglas Schilling Landgraf
da8d728b43 v1.18.1 2020-05-16 10:55:14 -04:00
Douglas Schilling Landgraf
06ba6e6eac bump release 1.18.0-2 2020-04-29 10:38:31 -04:00
Douglas Schilling Landgraf
6ee7c76731 build: include version data during the build
Resolves: github.com/cri-o/cri-o/issues/3684
2020-04-29 10:25:22 -04:00
Douglas Schilling Landgraf
54456ac5c6 source: v.1.18.0.tar.gz 2020-04-23 20:46:00 -04:00
Douglas Schilling Landgraf
3d9709cf88 spec: bump v1.18.0 2020-04-23 20:39:36 -04:00
Douglas Schilling Landgraf
bc144a2fa9 spec: fix github.com/cri-o/cri-o/issues/3631
metacopy is not recognized by old kernel versions.

Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
2020-04-23 20:21:33 -04:00
Douglas Schilling Landgraf
f4110fba3a v1.18.0-rc1 build
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
2020-04-15 11:53:07 -04:00
Lokesh Mandvekar
84a54436cf obsoletes understood, epoch:2 for everyone
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-04-10 15:02:04 -04:00
Lokesh Mandvekar
5fd069db30 package name cri-o for centos
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-04-10 14:56:14 -04:00
Lokesh Mandvekar
a5ed0e34cf Remove Obsoletes: older versions
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-04-09 13:55:53 -04:00
Lokesh Mandvekar
e10013455c cri-o OBS update problems
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-04-09 11:10:57 -04:00
Lokesh Mandvekar
b1032402a0 change package name format for centos
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-04-01 15:54:28 -04:00
Lokesh Mandvekar
3416e04673 no debuginfo for centos
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-03-31 14:19:59 -04:00
Lokesh Mandvekar
2774eacae4 cri-o-2:1.17.2-2
- use correct tag

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-03-31 09:25:28 -04:00
RH Container Bot
b429ba00b2 cri-o-2:1.17.2-1
Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-03-31 12:27:36 +00:00
Lokesh Mandvekar
cc633e797c correct conditional for aarch64
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-03-31 08:03:29 -04:00
Lokesh Mandvekar
6c199bc1bd disable debug for centos aarch64
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-03-28 08:15:32 -04:00
Lokesh Mandvekar
c9240ac3e2 use BR: golang instead of go-compiler blahblah
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-03-27 15:20:12 -04:00
Lokesh Mandvekar
85b574f200 adjust container-selinux dep for fedora v/s centos
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-03-27 14:59:04 -04:00
Lokesh Mandvekar
e81712fa98 btrfs and devmapper only for fedora
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-03-27 13:53:50 -04:00
Lokesh Mandvekar
6ac26d6617 cri-o-2:1.17.1-2
- Resolves: #1795858 - list /usr/share/containers/oci/hooks.d
- enable debuginfo
- spec changes for autobuilder

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-03-20 14:47:29 -04:00
RH Container Bot
76d709e2c5 cri-o-2:1.17.1-1
Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-03-16 14:12:32 +00:00
Aivaras Laimikis
88d1db036b Remove redundant % symbol in gobuild 2020-03-11 09:07:19 +00:00
RH Container Bot
73db24e940 cri-o-2:1.17.0-1
Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-02-10 19:29:31 +00:00
Lokesh Mandvekar
23e4cebac8 cri-o-2:1.17.0-0.1.gitb89a5fc
- built v1.17.0-rc1

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-01-14 17:46:47 +05:30
RH Container Bot
f464b7c6a1 cri-o-2:1.16.2-1
Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2020-01-08 16:25:23 +00:00
Lokesh Mandvekar
b8a1bcf2fb cri-o-2:1.16.1-1
- Resolves: #1740730, #1743017, #1754170

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-12-04 09:45:10 -05:00
Lokesh Mandvekar
537aea4c4b cri-o-2:1.16.0-0.4.rc2
- Resolves: #1740730, #1743017, #1754170 - no underscore in crio --version

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-11-15 15:35:23 -05:00
Lokesh Mandvekar
a2d1a6afc5 underscore char invalid in crio binary
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-11-15 14:55:03 -05:00
Lokesh Mandvekar
33abd92aa0 cri-o-2:1.16.0-0.3.rc2
- Requires: socat

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-11-05 10:55:02 -05:00
RH Container Bot
085a0b0119 cri-o-2:1.16.0-0.2.rc2
- bump to v1.16.0-rc2
- autobuilt a783f23

Signed-off-by: RH Container Bot <rhcontainerbot@fedoraproject.org>
2019-11-04 15:06:07 +00:00
Lokesh Mandvekar
3a4b54a975 provider_prefix not needed
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-11-04 09:15:24 -05:00
Lokesh Mandvekar
d662c77ece update release tag format
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-10-28 11:12:43 -04:00
Lokesh Mandvekar
5cee43f2fa update release tag format
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-10-28 10:02:28 -04:00
Lokesh Mandvekar
37dfcd16e8 update built_tag
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-10-28 09:47:53 -04:00
Lokesh Mandvekar
88421f7012 cri-o-2:1.16.0-1.rc1.git6a4b481
- built release-1.16

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-10-21 22:10:34 -04:00
Lokesh Mandvekar
87d53cec7b BR: make for centos
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2019-10-10 18:50:56 +00:00
Lokesh Mandvekar
47f61f5e3a cri-o-2:1.15.2-1
- bump to v1.15.2

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-10-03 15:43:09 -04:00
Lokesh Mandvekar
2a1d8fc9cc cri-o-2:1.15.1-2
- correct path in crio-wipe unitfile

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-09-09 19:14:02 +05:30
Lokesh Mandvekar
aab3493d96 correctly list installed files
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2019-09-04 09:51:56 -04:00
Lokesh Mandvekar
3800df9b5e cri-o-2:1.15.1-1
- bump to v1.15.1

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-09-04 18:49:37 +05:30
Lokesh Mandvekar
20958cb6d8 include built_tag macro
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-09-04 04:48:30 +05:30
Lokesh Mandvekar
4e8ec92aeb ensure GO111MODULE=off
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-07-21 15:35:03 -04:00
Lokesh Mandvekar
30f19410f0 no hack/ostree_tag.sh in 1.15.0
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-07-21 14:27:30 -04:00
Lokesh Mandvekar
d1a7b55476 define %gobuild if not already, epoch for centos as well
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-07-20 23:15:46 -04:00
Lokesh Mandvekar
86fe1caa82 cri-o-2:1.15.0-1
- bump to 1.15.0
- autobuilt 485227d

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-07-20 21:50:04 -04:00
Lokesh Mandvekar
719bda7307 packaging changes, no conmon subpackage
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-07-20 23:33:52 +05:30
Lokesh Mandvekar
b717dfb703 32-bit build patch merged upstream
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-07-18 00:39:38 +05:30
Lokesh Mandvekar
e19e3d00be update release tag
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-07-18 00:33:01 +05:30
Lokesh Mandvekar
26c6377132 cri-o-2:1.14.1-2.gitb7644f6
- add a patch to build on 32-bit systems (upstream PR: 2409)

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-05-27 08:38:49 +00:00
Lokesh Mandvekar
50d22f4bd5 cri-o-2:1.14.1-1.gitb7644f6
- bump to v1.14.1

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-05-23 07:09:03 +00:00
Lokesh Mandvekar
57f6ca4aa5 cri-o-2:1.13.9-1.gitd70609a
- bump to v1.13.9

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-05-23 07:02:39 +00:00
Lokesh Mandvekar
c9f86bb0d9 add tests
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-02-22 15:12:09 +05:30
Lokesh Mandvekar
ff2f8df0de cri-o-2:1.13.0-1.gite8a2525
- bump to v1.13.0

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2019-02-21 19:30:47 +05:30
Lokesh Mandvekar
082abacf36 cri-o-2:1.12.0-1.git18bc811
- bump to v1.12.1

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2018-11-24 23:41:17 -05:00
Lokesh Mandvekar
a7b724723d re-include BR: device-mapper-devel
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2018-10-31 08:34:27 -04:00
Lokesh Mandvekar
bfe40962d1 cri-o-2:1.12.0-1.git774a29e
- bump to v1.12.0

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2018-10-30 14:29:33 -04:00
Lokesh Mandvekar
33bfb78dc7 cri-o-2:1.11.8-1.git71cc465
- bump to v1.11.8
- built commit 71cc465

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2018-10-30 14:25:16 -04:00
Lokesh Mandvekar
252a04b0b7 cri-o-2:1.11.4-1.gite0c89d8
- bump to v1.11.4
- built commit e0c89d8
- crio.conf changes: cgroup_manager=systemd, file_locking=false

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2018-09-17 10:05:37 -04:00
Lokesh Mandvekar
1ac0d4b549 cri-o-2:1.11.3-1.git4fbb022
- bump to v1.11.3

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2018-09-11 14:11:14 -04:00
Lokesh Mandvekar
c759c453e3 cri-o-2:1.11.2-2.git3eac3b2
- no go-md2man or go compiler for ppc64

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2018-08-27 19:31:21 -04:00
Lokesh Mandvekar
54813a7097 conmon is a separate subpackage
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2018-08-27 16:00:35 -04:00
Lokesh Mandvekar
b306f25d9e cri-o-2:1.11.2-1.git3eac3b2
- bump to v1.11.2

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2018-08-27 15:38:56 -04:00
Lokesh Mandvekar
da6ef02fb7 Add Epoch for Fedora
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2018-07-05 14:36:09 -04:00
Lokesh Mandvekar
10dc384430 cri-o-2:1.11.0-1.rhaos3.11.git441bd3d
- bump to v1.11.0

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2018-07-05 14:25:35 -04:00
9 changed files with 798 additions and 0 deletions

37
.gitignore vendored
View file

@ -0,0 +1,37 @@
/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.3.tar.gz
/cri-o-1.21.1.tar.gz
/cri-o-1.21.2.tar.gz
/cri-o-1.21.4.tar.gz
/cri-o-1.21.5.tar.gz
/cri-o-1.21.6.tar.gz

664
cri-o.spec Normal file
View file

@ -0,0 +1,664 @@
# https://github.com/cri-o/cri-o
%global goipath github.com/cri-o/cri-o
Version: 1.21.6
%if 0%{?rhel} && 0%{?rhel} <= 8
%define gobuild(o:) %{expand:
# https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12
%global _dwz_low_mem_die_limit 0
%ifnarch ppc64
go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-}%{?currentgoldflags} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}' -compressdwarf=false" -a -v -x %{?**};
%else
go build -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-}%{?currentgoldflags} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}' -compressdwarf=false" -a -v -x %{?**};
%endif
}
%bcond_with check
%else
%gometa
%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 c03e400ec69fb22256a1b9c8f3ae8011a3539582
Name: cri-o
Epoch: 0
Release: 2%{?dist}
Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface
# Upstream license specification: Apache-2.0
License: ASL 2.0
URL: https://github.com/cri-o/cri-o
Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz
Source3: %{service_name}-network.sysconfig
Source4: %{service_name}-storage.sysconfig
Source5: %{service_name}-metrics.sysconfig
%if 0%{?rhel}
BuildRequires: golang
%endif
%if 0%{?rhel} && 0%{?rhel} <= 8
# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
%endif
%if 0%{?fedora}
BuildRequires: btrfs-progs-devel
BuildRequires: device-mapper-devel
BuildRequires: go-rpm-macros
%endif
BuildRequires: git-core
BuildRequires: glib2-devel
BuildRequires: glibc-static
BuildRequires: go-md2man
BuildRequires: gpgme-devel
BuildRequires: libassuan-devel
BuildRequires: libseccomp-devel
%if 0%{?rhel} && 0%{?rhel} < 8
BuildRequires: systemd-devel
%else
BuildRequires: systemd-rpm-macros
%endif
BuildRequires: make
%if 0%{?fedora}
Requires(pre): container-selinux
%else
Requires: container-selinux
%endif
Requires: containers-common >= 1:0.1.31-14
%if 0%{?rhel} && 0%{?rhel} < 8
Requires: runc >= 1.0.0-16
%else
Recommends: runc >= 1.0.0-16
%endif
Requires: containernetworking-plugins >= 0.7.5-1
Requires: conmon >= 2.0.2-1
Requires: socat
Obsoletes: ocid <= 0.3
Provides: ocid = %{epoch}:%{version}-%{release}
Provides: %{service_name} = %{epoch}:%{version}-%{release}
%description
Open Container Initiative-based implementation of Kubernetes Container Runtime
Interface.
%prep
%if 0%{?rhel} && 0%{?rhel} <= 8
%autosetup -p1 -n %{name}-%{version}
%else
%goprep -k
%endif
sed -i 's/install.config: crio.conf/install.config:/' Makefile
sed -i 's/install.bin: binaries/install.bin:/' Makefile
sed -i 's/install.man: $(MANPAGES)/install.man:/' Makefile
sed -i 's/\.gopathok //' Makefile
sed -i 's/module_/module-/' internal/version/version.go
sed -i 's/\/local//' contrib/systemd/%{service_name}.service
sed -i 's/\/local//' contrib/systemd/%{service_name}-wipe.service
%build
export GO111MODULE=on
export GOFLAGS=-mod=vendor
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)"
export LDFLAGS="-X %{goipath}/internal/pkg/criocli.DefaultsPath=%{criocli_path}
-X %{goipath}/internal/version.buildDate=%{build_timestamp}
-X %{goipath}/internal/version.gitCommit=%{commit0}
-X %{goipath}/internal/version.version=%{version}
-X %{goipath}/internal/version.gitTreeState=%{git_tree_state} "
for cmd in cmd/* ; do
%gobuild -o bin/$(basename $cmd) %{goipath}/$cmd
done
%if 0%{?fedora}
%set_build_flags
%endif
export CFLAGS="$CFLAGS -std=c99"
%make_build bin/pinns
GO_MD2MAN=go-md2man make docs
%install
sed -i 's/\/local//' contrib/systemd/%{service_name}.service
bin/%{service_name} \
--selinux \
--cni-plugin-dir /opt/cni/bin \
--cni-plugin-dir "%{_libexecdir}/cni" \
--enable-metrics \
--metrics-port 9537 \
config > %{service_name}.conf
# install binaries
install -dp %{buildroot}{%{_bindir},%{_libexecdir}/%{service_name}}
install -p -m 755 bin/%{service_name} %{buildroot}%{_bindir}
# install conf files
install -dp %{buildroot}%{_sysconfdir}/cni/net.d
install -p -m 644 contrib/cni/10-crio-bridge.conf %{buildroot}%{_sysconfdir}/cni/net.d/100-crio-bridge.conf
install -p -m 644 contrib/cni/99-loopback.conf %{buildroot}%{_sysconfdir}/cni/net.d/200-loopback.conf
install -dp %{buildroot}%{_sysconfdir}/%{service_name}
install -dp %{buildroot}%{_datadir}/containers/oci/hooks.d
install -dp %{buildroot}%{_datadir}/oci-umount/oci-umount.d
install -p -m 644 crio.conf %{buildroot}%{_sysconfdir}/%{service_name}
#install -p -m 644 seccomp.json %%{buildroot}%%{_sysconfdir}/%%{service_name}
install -p -m 644 crio-umount.conf %{buildroot}%{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf
install -p -m 644 crictl.yaml %{buildroot}%{_sysconfdir}
install -dp %{buildroot}%{_sysconfdir}/sysconfig
install -p -m 644 contrib/sysconfig/%{service_name} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}
install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}-network
install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}-storage
install -p -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}-metrics
%make_install PREFIX=%{buildroot}%{_prefix} \
install.bin \
install.completions \
install.config \
install.man \
install.systemd
%if 0%{?rhel} && 0%{?rhel} <= 7
# https://bugzilla.redhat.com/show_bug.cgi?id=1823374#c17
install -d -p %{buildroot}%{_prefix}/lib/sysctl.d
echo "fs.may_detach_mounts=1" > %{buildroot}%{_prefix}/lib/sysctl.d/99-cri-o.conf
%endif
install -dp %{buildroot}%{_sharedstatedir}/containers
%post
# Old verions of kernel do not recognize metacopy option.
# Reference: github.com/cri-o/cri-o/issues/3631
%if 0%{?rhel} && 0%{?rhel} <= 7
sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf
%sysctl_apply 99-cri-o.conf
%endif
%systemd_post %{service_name}
%preun
%systemd_preun %{service_name}
%postun
%systemd_postun_with_restart %{service_name}
%files
%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*
%dir %{_sysconfdir}/%{service_name}
%config(noreplace) %{_sysconfdir}/%{service_name}/%{service_name}.conf
%config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}-storage
%config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}-network
%config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}-metrics
%config(noreplace) %{_sysconfdir}/cni/net.d/100-%{service_name}-bridge.conf
%config(noreplace) %{_sysconfdir}/cni/net.d/200-loopback.conf
%config(noreplace) %{_sysconfdir}/crictl.yaml
%dir %{_libexecdir}/%{service_name}
%{_unitdir}/%{service_name}.service
%{_unitdir}/%{name}.service
%{_unitdir}/%{service_name}-shutdown.service
%{_unitdir}/%{service_name}-wipe.service
%dir %{_sharedstatedir}/containers
%dir %{_datadir}/containers
%dir %{_datadir}/containers/oci
%dir %{_datadir}/containers/oci/hooks.d
%dir %{_datadir}/oci-umount
%dir %{_datadir}/oci-umount/oci-umount.d
%{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf
%{_datadir}/bash-completion/completions/%{service_name}*
%{_datadir}/fish/completions/%{service_name}*.fish
%{_datadir}/zsh/site-functions/_%{service_name}*
%if 0%{?rhel} && 0%{?rhel} <= 7
%{_prefix}/lib/sysctl.d/99-cri-o.conf
%endif
%changelog
* Thu Mar 24 2022 Peter Hunt <pehunt@redhat.com> - 0:1.21.6-2
- drop check section
* Tue Mar 15 2022 Peter Hunt <pehunt@redhat.com> - 0:1.21.6-1
- bump to v1.21.6
* Thu Mar 10 2022 Peter Hunt <pehunt@redhat.com> - 0:1.21.5-1
- bump to v1.21.5
* Mon Dec 06 2021 Peter Hunt <pehunt@redhat.com> - 0:1.21.4-2
- fix bogus date
* Thu Nov 11 2021 Peter Hunt <pehunt@redhat.com> - 0:1.21.4-1
- bump to v1.21.4
* Wed Sep 15 2021 Peter Hunt <pehunt@redhat.com> - 0:1.21.3-1
- bump to v1.21.3
* Tue Jul 20 2021 Peter Hunt <pehunt@redhat.com> - 0:1.21.2-1
- bump to v1.21.2
* Mon Jul 19 2021 Peter Hunt <pehunt@redhat.com> - 0:1.21.1-1
- bump to v1.21.1
* Tue Jun 22 2021 Peter Hunt <pehunt@redhat.com> - 0:1.21.0-3
- update spec to be more conformant for fedora
* Wed Apr 14 2021 Peter Hunt <pehunt@redhat.com> - 0:1.21.0-2
- Use crio config for metrics configuration
- drop systemd from crio configuration
* Wed Apr 14 2021 Peter Hunt <pehunt@redhat.com> - 0:1.21.0-1
- Bump to v1.21.0
* Wed Mar 24 2021 Peter Hunt <pehunt@redhat.com> - 0:1.20.2-1
- Bump to v1.20.2
* Fri Mar 12 2021 Peter Hunt <pehunt@redhat.com> - 0:1.20.1-1
- Bump to v1.20.1
* Mon Feb 15 2021 Peter Hunt <pehunt@redhat.com> - 0:1.20.0-5
- Keep metacopy for fedora
* Tue Jan 12 2021 Peter Hunt <pehunt@redhat.com> - 0:1.20.0-4
- add fs.may_detach_mounts sysctl for centos/rhel 7
* Thu Dec 17 2020 Peter Hunt <pehunt@redhat.com> - 0:1.20.0-3
- Fix checksec for pinns
* Wed Dec 16 2020 Peter Hunt <pehunt@redhat.com> - 0:1.20.0-2
- enable PIE mode for cri-o
* Fri Dec 11 2020 Peter Hunt <pehunt@redhat.com> - 0:1.20.0-1
- Bump to v1.20.0
* Thu Nov 19 2020 Peter Hunt <pehunt@redhat.com> - 2:1.19.0-4
- fix timestamp for centos 7
* Mon Nov 9 2020 Peter Hunt <pehunt@redhat.com> - 2:1.19.0-3
- upstream#3879: fix symbolic link
* Mon Oct 05 2020 Peter Hunt <pehunt@redhat.com> - 2:1.19.0-2
- update selinux dep to handle OBS
* Mon Oct 05 2020 Peter Hunt <pehunt@redhat.com> - 2:1.19.0-1
- update go-md2man dependency to handle OBS
* Mon Sep 14 2020 Peter Hunt <pehunt@redhat.com> - 2:1.19.0-0
- bump to 1.19.0
* Tue Aug 04 2020 Peter Hunt <pehunt@redhat.com> - 2:1.18.3-1
- Github 3923: Make runc installation recommended
* Wed Jul 29 2020 Peter Hunt <pehunt@redhat.com> - 2:1.18.3-0
- Bump to v1.18.3
* Wed Jul 29 2020 Peter Hunt <pehunt@redhat.com> - 2:1.18.2-2
- remove custom conmon path
* Tue Jun 23 2020 Douglas Schilling Landgraf <dougsland@redhat.com> - 2:1.18.2-1
- Build 1.18.2
* Fri Jun 05 2020 Douglas Schilling Landgraf <dougsland@redhat.com> - 2:1.18.1-2
- Add --cni-plugin-dir /opt/cni/bin to cri-o conf file
* Thu May 14 2020 Douglas Schilling Landgraf <dougsland@redhat.com> - 2:1.18.1-1
- Release 1.18.1
* Thu Apr 23 2020 Douglas Schilling Landgraf <dougsland@redhat.com> - 2:1.18.0-2
- Fix crio version - github.com/cri-o/cri-o/issues/3684
* Thu Apr 23 2020 Douglas Schilling Landgraf <dougsland@redhat.com> - 2:1.18.0-1
- Bump for 1.18.0 release
* Wed Apr 15 2020 Douglas Schilling Landgraf <dougsland@redhat.com> - 2:1.18.0-0.1.rc1
- Bump for 1.18 release candidate
* Tue Mar 31 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.17.2-2
- use correct tag
* Tue Mar 31 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.17.2-1
- autobuilt v1.17.2
* Fri Mar 20 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.17.1-2
- Resolves: #1795858 - list /usr/share/containers/oci/hooks.d
- enable debuginfo
- spec changes for autobuilder
* Mon Mar 16 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.17.1-1
- autobuilt v1.17.1
* Mon Feb 10 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.17.0-1
- autobuilt $LATEST_TAG
* Tue Jan 14 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.17.0-0.1.gitb89a5fc
- built v1.17.0-rc1
* Wed Jan 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.16.2-1
- autobuilt $LATEST_TAG
* Wed Dec 04 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.16.1-1
- Resolves: #1740730, #1743017, #1754170
* Fri Nov 15 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.16.0-0.4.rc2
- Resolves: #1740730, #1743017, #1754170 - no underscore in crio --version
* Tue Nov 05 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.16.0-0.3.rc2
- Requires: socat
* Mon Nov 04 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.16.0-0.2.rc2
- bump to v1.16.0-rc2
- autobuilt a783f23
* Mon Oct 21 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.16.0-1.rc1.git6a4b481
- built release-1.16
* Thu Oct 03 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.15.2-1
- bump to v1.15.2
* Mon Sep 09 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.15.1-2
- correct path in crio-wipe unitfile
* Wed Sep 04 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.15.1-1
- bump to v1.15.1
* Sun Jul 21 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.15.0-1
- bump to 1.15.0
- autobuilt 485227d
* Mon May 27 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.14.1-2.gitb7644f6
- add a patch to build on 32-bit systems (upstream PR: 2409)
* Thu May 23 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.14.1-1.gitb7644f6
- bump to v1.14.1
* Thu May 23 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.13.9-1.gitd70609a
- bump to v1.13.9
* Thu Feb 21 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.13.0-1.gite8a2525
- bump to v1.13.0
* Sat Nov 24 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.12.0-1.git18bc811
- bump to v1.12.1
* Tue Oct 30 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.12.0-1.git774a29e
- bump to v1.12.0
* Tue Oct 30 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.11.8-1.git71cc465
- bump to v1.11.8
- built commit 71cc465
* Mon Sep 17 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.11.4-1.gite0c89d8
- bump to v1.11.4
- built commit e0c89d8
- crio.conf changes: cgroup_manager=systemd, file_locking=false
* Tue Sep 11 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.11.3-1.git4fbb022
- bump to v1.11.3
* Mon Aug 27 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.11.2-2.git3eac3b2
- no go-md2man or go compiler for ppc64
* Mon Aug 27 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.11.2-1.git3eac3b2
- bump to v1.11.2
- conmon is a separate subpackage
* Mon Jul 2 2018 Dan Walsh <dwalsh@redhat.com> - 2:1.11.0-1.rhaos3.11.git441bd3d
- bump to v1.11.0
* Mon Jul 2 2018 Dan Walsh <dwalsh@redhat.com> - 2:1.10.5-1.rhaos3.10.git
- bump to v1.10.5
* Wed Jun 27 2018 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.10.4-1.rhaos3.10.gitebaa77a
- bump to v1.10.4
- remove devel and unittest subpackages - unused
- debuginfo disabled for now, complains about %%files being empty
* Mon Jun 18 2018 Dan Walsh <dwalsh@redhat.com> - 2:1.10.3-1.rhaos3.10.gite558bd
- bump to v1.10.3
* Tue Jun 12 2018 Dan Walsh <dwalsh@redhat.com> - 2:1.10.2-2.rhaos3.10.git1ffcbb
- Released version of v1.10.2
* Tue May 15 2018 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.10.2-1.rhaos3.10.git095e88c
- bump to v1.10.2
- built commit 095e88c
- include rhaos3.10 in release tag
- do not compress debuginfo with dwz to support delve debugger
* Tue May 8 2018 Dan Walsh <dwalsh@redhat.com> - 2:1.10.1-2.git728df92
- bump to v1.10.1
* Wed Mar 28 2018 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.10.0-1.beta.1gitc956614
- bump to v1.10.0-beta.1
- built commit c956614
* Tue Mar 13 2018 Dan Walsh <dwalsh@redhat.com> - 2:1.9.10-1.git8723732
- bump to v1.9.10
* Fri Mar 09 2018 Dan Walsh <dwalsh@redhat.com> - 2:1.9.9-1.git4d7e7dc
- bump to v1.9.9
* Fri Feb 23 2018 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.9.8-1.git7d9d2aa
- bump to v1.9.8
* Fri Feb 23 2018 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.9.7-2.gita98f9c9
- correct version in previous changelog entry
* Fri Feb 23 2018 Dan Walsh <dwalsh@redhat.com> - 2:1.9.7-1.gita98f9c9
- Merge pull request #1357 from runcom/netns-fixes
- sandbox_stop: close/remove the netns _after_ stopping the containers
- sandbox net: set netns closed after actaully closing it
* Wed Feb 21 2018 Dan Walsh <dwalsh@redhat.com> - 2:1.9.6-1.git5e48c92
- vendor: update c/image to handle text/plain from registries
* Fri Feb 16 2018 Dan Walsh <dwalsh@redhat.com> - 2:1.9.5-1.git125ec8a
- image: Add lock around image cache access
* Thu Feb 15 2018 Dan Walsh <dwalsh@redhat.com> - 2:1.9.4-1.git28c7dee
- imageService: cache information about images
- container_create: correctly set user
- system container: add /var/tmp as RW
* Sun Feb 11 2018 Dan Walsh <dwalsh@redhat.com> - 2:1.9.3-1.git63ea1dd
- Update containers/image and containers/storage
- Pick up lots of fixes in image and storage library
* Thu Feb 8 2018 Dan Walsh <dwalsh@redhat.com> - 2:1.9.2-1.gitb066a83
- sandbox: fix sandbox logPath when crio restarts
- syscontainers, rhel: add ADDTL_MOUNTS
- Adapt to recent containers/image API updates
- container_create: only bind mount /etc/hosts if not provided by k8s
* Wed Jan 24 2018 Dan Walsh <dwalsh@redhat.com> - 2:1.9.1-1.gitb066a8
- Final Release 1.9.1
* Wed Jan 03 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 2:1.8.4-4.gitdffb5c2
- epoch not needed, 1.9 was never shipped, 1.8 with epoch also never shipped
* Wed Jan 03 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 2:1.8.4-3.gitdffb5c2
- reversed to 1.8, epoch
* Mon Dec 18 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1.9.0-1.git814c6ab
- bump to v1.9.0
* Fri Dec 15 2017 Dan Walsh <dwalsh@redhat.com> - 1.8.4-1.gitdffb5c2
- bump to v1.8.4
* Wed Nov 29 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1.8.2-1.git3de7ab4
- bump to v1.8.2
* Mon Nov 20 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1.8.0-1.git80f54bc
- bump to v1.8.0
* Wed Nov 15 2017 Dan Walsh <dwalsh@redhat.com> - 1.0.4-2.git4aceedee
- Fix script error in kpod completions.
* Mon Nov 13 2017 Dan Walsh <dwalsh@redhat.com> - 1.0.4-1.git4aceedee
- bump to v1.0.4
- Add crictl.yaml
- Add prometheous end points
- Several bug fixes
* Fri Nov 10 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1.0.3-1.git17bcfb4
- bump to v1.0.3
* Fri Nov 03 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1.0.2-3.git748bc46
- enable debuginfo for C binaries
* Fri Nov 03 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1.0.2-2.git748bc46
- enable debuginfo
* Mon Oct 30 2017 Dan Walsh <dwalsh@redhat.com> - 1.0.2-1.git748bc46
- Lots of bug fixes
- Fixes to pass cri-tools tests
* Wed Oct 25 2017 Dan Walsh <dwalsh@redhat.com> - 1.0.1-1.git64a30e1
- Lots of bug fixes
- Fixes to pass cri-tools tests
* Thu Oct 19 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1.0.0-7.gita636972
- update dep NVRs
- update release tag
* Mon Oct 16 2017 Dan Walsh <dwalsh@redhat.com> - 1.0.0-6.gita636972
- Get the correct checksum
- Setup storage-opt to override kernel check
* Fri Oct 13 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1.0.0-2.gitcd1bac5
- bump to v1.0.0
- require containernetworking-plugins >= 0.5.2-3
* Wed Oct 11 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1.0.0-1.rc3.gitd2c6f64
- bump to v1.0.0-rc3
* Wed Sep 20 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1.0.0-1.rc2.git6784a66
- bump to v1.0.0-rc2
* Mon Sep 18 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1.0.0-2.rc1.gitbb1da97
- bump release tag and build for extras
* Mon Sep 18 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1.0.0-1.rc1.gitbb1da97
- bump to v1.0.0-rc1 tag
- built commit bb1da97
- use bundled deps
- disable devel package
- remove redundant meta-provides
* Thu Aug 3 2017 Dan Walsh <dwalsh@redhat.com> - 1.0.0.beta.0-1.git66d96e7
- Beta Release
- Additional registry support
- Daemon pids-limit support
- cri-o daemon now supports a default pid-limit on all containers to prevent fork-bombs. This is configurable by admins through a flag or /etc/crio/crio.conf
- Configurable image volume support
- Bugs and Stability fixes
- OCI 1.0 runtime support
- 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
- remove cri-o-cni subpackage
- require containernetworking-plugins >= 0.5.2-2 (same as containernetworking-cni)
* Fri Jun 23 2017 Antonio Murdaca <runcom@fedoraproject.org> - 1.0.0.alpha.0-0.git5dcbdc0.3
- rebuilt to include cri-o-cni sub package
* Wed Jun 21 2017 Antonio Murdaca <runcom@fedoraproject.org> - 1.0.0.alpha.0-0.git5dcbdc0.2
- rebuilt for s390x
* Wed Jun 21 2017 Antonio Murdaca <runcom@fedoraproject.org> - 1.0.0.alpha.0-0.git5dcbdc0.1
- built first alpha release
* Fri May 5 2017 Dan Walsh <dwalsh@redhat.com> 0.3-0.gitf648cd6e
- Bump up version to 0.3
* Tue Mar 21 2017 Dan Walsh <dwalsh@redhat.com> 0.2-1.git7d7570e
- Bump up version to 0.2
* Tue Mar 21 2017 Dan Walsh <dwalsh@redhat.com> 0.1-1.git9bf26b5
- Bump up version to 0.1
* Mon Feb 13 2017 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0-0.15.git0639f06
- built commit 0639f06
- packaging workarounds for 'go install'
* Wed Feb 8 2017 Dan Walsh <dwalsh@redhat.com> 0-0.14.git6bd7c53
- Use newer versions of runc
- Applying k8s kubelet v3 api to cri-o server
- Applying k8s.io v3 API for ocic and ocid
- doc: Add instruction to run cri-o with kubernetes
- Lots of updates of container/storage and containers/image
* Mon Jan 23 2017 Peter Robinson <pbrobinson@fedoraproject.org> 0-0.13.git7cc8492
- Build on all kubernetes arches
* Fri Jan 20 2017 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0-0.12.git7cc8492
- add bash completion
- From: Daniel J Walsh <dwalsh@redhat.com>
* Thu Jan 19 2017 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0-0.11.git7cc8492
- remove trailing whitespace from unitfile
* Thu Jan 19 2017 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0-0.10.git7cc8492
- built commit 7cc8492
- packaging fixes from Nalin Dahyabhai <nalin@redhat.com>
* Thu Jan 19 2017 Dan Walsh <dwalsh@redhat.com> - 0-0.9.gitb9dc097
- Change to require skopeo-containers
- Merge Nalind/storage patch
- Now uses Storage for Image Management
* Mon Jan 16 2017 Lokesh Manvekar <lsm5@fedoraproject.org> - 0-0.8.git2e6070f
- packaging changes from Nalin Dahyabhai <nalin@redhat.com>
- Don't make the ExecReload setting part of the ExecStart setting.
- Create ocid.conf in install, not in check.
- Own /etc/ocid.
- Install an "anything goes" pulling policy for a default.
* Thu Dec 22 2016 Dan Walsh <dwalsh@redhat.com> - 0-0.7.git2e6070f
- Switch locate to /var/lib/containers for images
* Thu Dec 22 2016 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0-0.6.git2e6070f
- built commit 2e6070f
* Wed Dec 21 2016 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0-0.5.git36dfef5
- install plugins into /usr/libexec/ocid/cni/
- require runc >= 1.0.0 rc2
* Wed Dec 21 2016 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0-0.4.git36dfef5
- built runcom/alpha commit 36dfef5
- cni bundled for now
* Thu Dec 15 2016 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0-0.3.gitc57530e
- Resolves: #1392977 - first upload to Fedora
- add build deps, enable only for x86_64 (doesn't build on i686)
* Thu Dec 15 2016 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0-0.2.gitc57530e
- add Godeps.json
* Tue Nov 08 2016 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0-0.1.gitc57530e
- First package for Fedora

2
crio-metrics.sysconfig Normal file
View file

@ -0,0 +1,2 @@
# /etc/sysconfig/crio-metrics
CRIO_METRICS_OPTIONS=

2
crio-network.sysconfig Normal file
View file

@ -0,0 +1,2 @@
# /etc/sysconfig/crio-network
CRIO_NETWORK_OPTIONS=

2
crio-storage.sysconfig Normal file
View file

@ -0,0 +1,2 @@
# /etc/sysconfig/crio-storage
CRIO_STORAGE_OPTIONS=

View file

@ -0,0 +1 @@
SHA512 (cri-o-1.21.6.tar.gz) = 3ad23983d4822f19a0f227968d2b80648c725f6f18bec3467e426af2966b3e1e16b720b86fff8339c8c1503f78019779558e38ee4b325ec2eb52cfb639ac4fdc

53
tests/test_crio.sh Executable file
View file

@ -0,0 +1,53 @@
#!/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

36
tests/test_crio.yml Normal file
View file

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

1
tests/tests.yml Normal file
View file

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