[2.13] Backport CRI-O bugfixes (#6230)

* Enable crio 1.18 (#6197)

* fix CRI-O repos for centos distributions (#6224)

* fix CRI-O repos for centos distributions

* fix CRI-O repos for centos distributions
- revert workarounds

* fix CRI-O repos for centos distributions
- use https for centos repos

* avoid 302 redirects for centos repos

* Use OS packaging default value for apparmor_profile in crio.conf (#6125)

Co-authored-by: jeanfabrice <github@bobo-rousselin.com>
This commit is contained in:
spaced
2020-06-04 16:09:15 +02:00
committed by GitHub
parent dd539cf360
commit 051e08e31c
5 changed files with 17 additions and 12 deletions

View File

@@ -8,12 +8,12 @@ lint:
options:
config-file: ../../../.yamllint
platforms:
# - name: ubuntu1804
# box: generic/ubuntu1804
# cpus: 2
# memory: 1024
# groups:
# - kube-master
- name: ubuntu1804
box: generic/ubuntu1804
cpus: 2
memory: 1024
groups:
- kube-master
- name: centos7
box: centos/7
cpus: 2