From e62802cf8a27034b650d60e5e4f5e0755930de93 Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Tue, 19 Jul 2022 11:06:35 +0200
Subject: [PATCH] Move nerdctl snapshotter option to overlayfs

---
 .gitlab-ci/packet.yml                                    | 4 ++--
 .gitlab-ci/vagrant.yml                                   | 4 ++--
 roles/container-engine/nerdctl/templates/nerdctl.toml.j2 | 2 +-
 tests/scripts/testcases_run.sh                           | 3 +++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
index 57a7f0b31..77d1082fb 100644
--- a/.gitlab-ci/packet.yml
+++ b/.gitlab-ci/packet.yml
@@ -255,8 +255,8 @@ packet_fedora34-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
diff --git a/.gitlab-ci/vagrant.yml b/.gitlab-ci/vagrant.yml
index 8c0f4a21d..ce17c6e2c 100644
--- a/.gitlab-ci/vagrant.yml
+++ b/.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
diff --git a/roles/container-engine/nerdctl/templates/nerdctl.toml.j2 b/roles/container-engine/nerdctl/templates/nerdctl.toml.j2
index cd1b5f9e2..8dbd56576 100644
--- a/roles/container-engine/nerdctl/templates/nerdctl.toml.j2
+++ b/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') }}"
diff --git a/tests/scripts/testcases_run.sh b/tests/scripts/testcases_run.sh
index 5947309df..02f617985 100755
--- a/tests/scripts/testcases_run.sh
+++ b/tests/scripts/testcases_run.sh
@@ -53,6 +53,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