From 58ea10572a80714c6cf0572c54ae9d834f2b1f22 Mon Sep 17 00:00:00 2001
From: Calin Cristian Andrei <cristian.calin@outlook.com>
Date: Sat, 20 Nov 2021 15:46:04 +0000
Subject: [PATCH] CI: Fix upgrade tests

* should run compatible with old settings, this means docker
* we need to run with a distro that has at least modern containerd,
  this means move from debian9 to debian10 to allow `containerd_version`
  to match between 2.17 and master
---
 .gitlab-ci/packet.yml                                       | 4 ++--
 docs/ci.md                                                  | 4 ++--
 ...ade-once.yml => packet_debian10-calico-upgrade-once.yml} | 6 +++++-
 ...alico-upgrade.yml => packet_debian10-calico-upgrade.yml} | 6 +++++-
 4 files changed, 14 insertions(+), 6 deletions(-)
 rename tests/files/{packet_debian9-calico-upgrade-once.yml => packet_debian10-calico-upgrade-once.yml} (66%)
 rename tests/files/{packet_debian9-calico-upgrade.yml => packet_debian10-calico-upgrade.yml} (55%)

diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
index 2f1f1191190..2f9c46def79 100644
--- a/.gitlab-ci/packet.yml
+++ b/.gitlab-ci/packet.yml
@@ -256,14 +256,14 @@ packet_ubuntu20-calico-ha-wireguard:
   extends: .packet_pr
   when: manual
 
-packet_debian9-calico-upgrade:
+packet_debian10-calico-upgrade:
   stage: deploy-part3
   extends: .packet_pr
   when: on_success
   variables:
     UPGRADE_TEST: graceful
 
-packet_debian9-calico-upgrade-once:
+packet_debian10-calico-upgrade-once:
   stage: deploy-part3
   extends: .packet_periodic
   when: on_success
diff --git a/docs/ci.md b/docs/ci.md
index a05c18e87c0..982756ed089 100644
--- a/docs/ci.md
+++ b/docs/ci.md
@@ -11,7 +11,7 @@ centos7 |  :white_check_mark: | :x: | :x: | :white_check_mark: | :x: | :white_ch
 centos8 |  :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: |
 debian10 |  :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: |
 debian11 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-debian9 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: |
+debian9 |  :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: |
 fedora33 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 fedora34 |  :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: |
 opensuse |  :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
@@ -47,7 +47,7 @@ centos7 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :white
 centos8 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 debian10 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 debian11 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-debian9 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
+debian9 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 fedora33 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 fedora34 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: |
 opensuse |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
diff --git a/tests/files/packet_debian9-calico-upgrade-once.yml b/tests/files/packet_debian10-calico-upgrade-once.yml
similarity index 66%
rename from tests/files/packet_debian9-calico-upgrade-once.yml
rename to tests/files/packet_debian10-calico-upgrade-once.yml
index dcf4186c795..3e356e2f535 100644
--- a/tests/files/packet_debian9-calico-upgrade-once.yml
+++ b/tests/files/packet_debian10-calico-upgrade-once.yml
@@ -1,6 +1,6 @@
 ---
 # Instance settings
-cloud_image: debian-9
+cloud_image: debian-10
 mode: default
 
 # Kubespray settings
@@ -9,5 +9,9 @@ deploy_netchecker: true
 dns_min_replicas: 1
 download_run_once: true
 
+# Docker specific settings:
+container_manager: docker
+etcd_deployment_type: docker
+
 # Make docker happy
 docker_containerd_version: latest
diff --git a/tests/files/packet_debian9-calico-upgrade.yml b/tests/files/packet_debian10-calico-upgrade.yml
similarity index 55%
rename from tests/files/packet_debian9-calico-upgrade.yml
rename to tests/files/packet_debian10-calico-upgrade.yml
index ca5ef121622..daf0e70917d 100644
--- a/tests/files/packet_debian9-calico-upgrade.yml
+++ b/tests/files/packet_debian10-calico-upgrade.yml
@@ -1,9 +1,13 @@
 ---
 # Instance settings
-cloud_image: debian-9
+cloud_image: debian-10
 mode: default
 
 # Kubespray settings
 kube_network_plugin: calico
 deploy_netchecker: true
 dns_min_replicas: 1
+
+# Docker specific settings:
+container_manager: docker
+etcd_deployment_type: docker