From ba348c9a009cf5cafe68dfdfad968229e968f9ce Mon Sep 17 00:00:00 2001 From: Florian Ruynat <16313165+floryut@users.noreply.github.com> Date: Mon, 1 Mar 2021 18:57:26 +0100 Subject: [PATCH] Move centos7-crio CI job to centos8 (#7327) (cherry picked from commit e35becebf8f55ce3dc32be26ed64495916291889) --- .gitlab-ci/packet.yml | 4 +--- docs/ci.md | 4 ++-- tests/files/packet_centos8-calico.yml | 4 ++-- .../{packet_centos7-crio.yml => packet_centos8-crio.yml} | 8 ++++---- 4 files changed, 9 insertions(+), 11 deletions(-) rename tests/files/{packet_centos7-crio.yml => packet_centos8-crio.yml} (71%) diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml index 87e082e62..e5e9e4c27 100644 --- a/.gitlab-ci/packet.yml +++ b/.gitlab-ci/packet.yml @@ -42,12 +42,10 @@ packet_centos7-flannel-containerd-addons-ha: variables: MITOGEN_ENABLE: "true" -packet_centos7-crio: +packet_centos8-crio: extends: .packet_pr stage: deploy-part2 when: on_success - variables: - MITOGEN_ENABLE: "true" packet_ubuntu18-crio: extends: .packet_pr diff --git a/docs/ci.md b/docs/ci.md index 5b3c20bba..f18990921 100644 --- a/docs/ci.md +++ b/docs/ci.md @@ -24,8 +24,8 @@ ubuntu20 | :white_check_mark: | :x: | :x: | :white_check_mark: | :x: | :x: | :x | OS / CNI | calico | canal | cilium | flannel | kube-ovn | kube-router | macvlan | ovn4nfv | weave | |---| --- | --- | --- | --- | --- | --- | --- | --- | --- | amazon | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -centos7 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -centos8 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +centos7 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +centos8 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | debian10 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | debian9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | fedora32 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | diff --git a/tests/files/packet_centos8-calico.yml b/tests/files/packet_centos8-calico.yml index 209b44ff4..680238720 100644 --- a/tests/files/packet_centos8-calico.yml +++ b/tests/files/packet_centos8-calico.yml @@ -12,5 +12,5 @@ dashboard_namespace: "kube-dashboard" dashboard_enabled: true loadbalancer_apiserver_type: haproxy -# required / not autodetected for now -calico_iptables_backend: "NFT" +# required +calico_iptables_backend: "Auto" diff --git a/tests/files/packet_centos7-crio.yml b/tests/files/packet_centos8-crio.yml similarity index 71% rename from tests/files/packet_centos7-crio.yml rename to tests/files/packet_centos8-crio.yml index e6460e7cd..5baaaf832 100644 --- a/tests/files/packet_centos7-crio.yml +++ b/tests/files/packet_centos8-crio.yml @@ -1,6 +1,6 @@ --- # Instance settings -cloud_image: centos-7 +cloud_image: centos-8 mode: default # Kubespray settings @@ -8,8 +8,8 @@ deploy_netchecker: true dns_min_replicas: 1 container_manager: crio -download_localhost: false -download_run_once: true - # CRI-O requirements etcd_deployment_type: host + +# required +calico_iptables_backend: "Auto"