CI: adjust test scenarios for downloaded containerd

kubernetes-sigs · Oct 20, 2021 · 6edda60 · 6edda60
1 parent c48e090
commit 6edda60
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 23 deletions.
diff --git a/roles/container-engine/containerd-common/vars/ubuntu-16.yml b/roles/container-engine/containerd-common/vars/ubuntu-16.yml
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
@@ -447,14 +447,18 @@ nerdctl_archive_checksums:
   amd64:
     0.12.1: 868dc5997c3edb0bd06f75012e71c2b15ee0885b83bad191fbe2a1d6d5f4f2ac
 
+# TODO(cristicalin): remove compatibility entries once debian9 and ubuntu16 jobs are dropped or docker is dropped
 containerd_archive_checksums:
   arm:
+    latest: 0  # this is needed to make debian9 and ubuntu16 CI jobs happy
     1.4.9: 0
     1.5.5: 0
   arm64:
+    latest: 0  # this is needed to make debian9 and ubuntu16 CI jobs happy
     1.4.9: 0
     1.5.5: 0
   amd64:
+    latest: 0  # this is needed to make debian9 and ubuntu16 CI jobs happy
     1.4.9: 346f88ad5b973960ff81b5539d4177af5941ec2e4703b479ca9a6081ff1d023b
     1.5.5: 8efc527ffb772a82021800f0151374a3113ed2439922497ff08f2596a70f10f1
 

diff --git a/tests/files/packet_debian9-calico-upgrade-once.yml b/tests/files/packet_debian9-calico-upgrade-once.yml
@@ -8,3 +8,6 @@ kube_network_plugin: calico
 deploy_netchecker: true
 dns_min_replicas: 1
 download_run_once: true
+
+# Make docker happy
+containerd_version: latest
diff --git a/tests/files/packet_debian9-calico-upgrade.yml b/tests/files/packet_debian9-calico-upgrade.yml
@@ -7,3 +7,6 @@ mode: default
 kube_network_plugin: calico
 deploy_netchecker: true
 dns_min_replicas: 1
+
+# Make docker happy
+containerd_version: latest
diff --git a/tests/files/packet_debian9-macvlan.yml b/tests/files/packet_debian9-macvlan.yml
@@ -12,3 +12,6 @@ kube_proxy_masquerade_all: true
 macvlan_interface: "eth0"
 
 auto_renew_certificates: true
+
+# Make docker happy
+containerd_version: latest
diff --git a/tests/files/packet_fedora34-kube-ovn-containerd.yml b/tests/files/packet_fedora34-kube-ovn-containerd.yml
@@ -5,7 +5,6 @@ mode: default
 
 # Kubespray settings
 container_manager: containerd
-containerd_version: latest
 etcd_deployment_type: host
 deploy_netchecker: true
 dns_min_replicas: 1

diff --git a/tests/files/packet_ubuntu16-canal-kubeadm-ha.yml b/tests/files/packet_ubuntu16-canal-kubeadm-ha.yml
@@ -9,5 +9,5 @@ kube_network_plugin: canal
 deploy_netchecker: true
 dns_min_replicas: 1
 
-# Ubuntu 16 packages for containerd are limited to 1.4.6
-containerd_version: 1.4.6
+# Make docker jobs happy
+containerd_version: latest
diff --git a/tests/files/packet_ubuntu16-canal-sep.yml b/tests/files/packet_ubuntu16-canal-sep.yml
@@ -9,5 +9,5 @@ kube_network_plugin: canal
 deploy_netchecker: true
 dns_min_replicas: 1
 
-# Ubuntu 16 packages for containerd are limited to 1.4.6
-containerd_version: 1.4.6
+# Make docker jobs happy
+containerd_version: latest
diff --git a/tests/files/packet_ubuntu16-flannel-ha.yml b/tests/files/packet_ubuntu16-flannel-ha.yml
@@ -11,5 +11,5 @@ skip_non_kubeadm_warning: true
 deploy_netchecker: true
 dns_min_replicas: 1
 
-# Ubuntu 16 packages for containerd are limited to 1.4.6
-containerd_version: 1.4.6
+# Make docker jobs happy
+containerd_version: latest
diff --git a/tests/files/packet_ubuntu16-kube-router-sep.yml b/tests/files/packet_ubuntu16-kube-router-sep.yml
@@ -9,5 +9,5 @@ kube_network_plugin: kube-router
 deploy_netchecker: true
 dns_min_replicas: 1
 
-# Ubuntu 16 packages for containerd are limited to 1.4.6
-containerd_version: 1.4.6
+# Make docker jobs happy
+containerd_version: latest
diff --git a/tests/files/packet_ubuntu16-kube-router-svc-proxy.yml b/tests/files/packet_ubuntu16-kube-router-svc-proxy.yml
@@ -11,5 +11,5 @@ dns_min_replicas: 1
 
 kube_router_run_service_proxy: true
 
-# Ubuntu 16 packages for containerd are limited to 1.4.6
-containerd_version: 1.4.6
+# Make docker jobs happy
+containerd_version: latest
diff --git a/tests/files/packet_ubuntu16-weave-sep.yml b/tests/files/packet_ubuntu16-weave-sep.yml
@@ -10,5 +10,5 @@ dns_min_replicas: 1
 
 auto_renew_certificates: true
 
-# Ubuntu 16 packages for containerd are limited to 1.4.6
-containerd_version: 1.4.6
+# Make docker jobs happy
+containerd_version: latest