Merge d23018f1e0 into fc0d58ff48

.gitlab-ci/packet.yml

@@ -265,8 +265,8 @@ packet_fedora36-kube-ovn:
 # Long jobs (45min+)
 
 packet_centos7-weave-upgrade-ha:
-  stage: deploy-part3
-  extends: .packet_periodic
+  stage: unit-tests
+  extends: .packet_pr
   when: on_success
   variables:
     UPGRADE_TEST: basic

.gitlab-ci/vagrant.yml

@@ -35,9 +35,9 @@ vagrant_ubuntu18-flannel:
   when: on_success
 
 vagrant_ubuntu18-weave-medium:
-  stage: deploy-part2
+  stage: unit-tests
   extends: .vagrant
-  when: manual
+  when: on_success
 
 vagrant_ubuntu20-flannel:
   stage: deploy-part2

roles/container-engine/nerdctl/templates/nerdctl.toml.j2

@@ -2,7 +2,7 @@ debug             = false
 debug_full        = false
 address           = "{{ cri_socket }}"
 namespace         = "k8s.io"
-snapshotter       = "native"
+snapshotter       = "overlayfs"
 cni_path          = "/opt/cni/bin"
 cni_netconfpath   = "/etc/cni/net.d"
 cgroup_manager    = "{{ kubelet_cgroup_driver | default('systemd') }}"

roles/kubernetes/preinstall/handlers/main.yml

@@ -104,6 +104,10 @@
     - inventory_hostname in groups['kube_control_plane']
     - dns_mode != 'none'
     - resolvconf_mode == 'host_resolvconf'
+  register: crictl_restart
+  retries: 12
+  delay: 5
+  until: crictl_restart.rc == 0
 
 # When running this as the last phase ensure we wait for kube-apiserver to come up
 - name: Preinstall | wait for the apiserver to be running

tests/scripts/testcases_run.sh

@@ -60,6 +60,9 @@ test "${UPGRADE_TEST}" != "false" && git fetch --all && git checkout "$KUBESPRAY
 test "${UPGRADE_TEST}" != "false" && git checkout "${CI_BUILD_REF}" tests/files/${CI_JOB_NAME}.yml
 test "${UPGRADE_TEST}" != "false" && git checkout "${CI_BUILD_REF}" ${CI_TEST_REGISTRY_MIRROR}
 test "${UPGRADE_TEST}" != "false" && git checkout "${CI_BUILD_REF}" ${CI_TEST_SETTING}
+### FIXME FLORYUT Needed for upgrade job, will be removed when releasing kubespray 2.20
+test "${UPGRADE_TEST}" != "false" && git checkout "${CI_BUILD_REF}" roles/container-engine/nerdctl/templates/nerdctl.toml.j2
+### /FIXME
 
 # Create cluster
 ansible-playbook ${ANSIBLE_LOG_LEVEL} -e @${CI_TEST_SETTING} -e @${CI_TEST_REGISTRY_MIRROR} -e @${CI_TEST_VARS} -e local_release_dir=${PWD}/downloads --limit "all:!fake_hosts" cluster.yml