From e82443241be2090fcc53c0efabbcf93cce221cbb Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Thu, 2 Dec 2021 17:01:34 +0100
Subject: [PATCH] Move opensuse CI to docker and fix ubuntu16 containerd
 version for docker (#8257)

---
 .gitlab-ci/packet.yml                            |  5 +++++
 docs/ci.md                                       |  2 +-
 tests/files/packet_opensuse-docker-cilium.yml    | 11 +++++++++++
 tests/files/packet_ubuntu16-docker-weave-sep.yml |  3 +++
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 tests/files/packet_opensuse-docker-cilium.yml

diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
index 2fe749e8e..472ae99a3 100644
--- a/.gitlab-ci/packet.yml
+++ b/.gitlab-ci/packet.yml
@@ -164,6 +164,11 @@ packet_opensuse-canal:
   extends: .packet_periodic
   when: on_success
 
+packet_opensuse-docker-cilium:
+  stage: deploy-part2
+  extends: .packet_pr
+  when: manual
+
 packet_ubuntu18-ovn4nfv:
   stage: deploy-part2
   extends: .packet_periodic
diff --git a/docs/ci.md b/docs/ci.md
index 55d6a7967..bb97cedfd 100644
--- a/docs/ci.md
+++ b/docs/ci.md
@@ -50,7 +50,7 @@ debian11 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 debian9 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 fedora34 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: |
 fedora35 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-opensuse |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
+opensuse |  :x: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: |
 oracle7 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 ubuntu16 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: |
 ubuntu18 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
diff --git a/tests/files/packet_opensuse-docker-cilium.yml b/tests/files/packet_opensuse-docker-cilium.yml
new file mode 100644
index 000000000..16ae3933a
--- /dev/null
+++ b/tests/files/packet_opensuse-docker-cilium.yml
@@ -0,0 +1,11 @@
+---
+# Instance settings
+cloud_image: opensuse-leap-15
+mode: default
+
+# Kubespray settings
+kube_network_plugin: cilium
+
+# Docker specific settings:
+container_manager: docker
+etcd_deployment_type: docker
diff --git a/tests/files/packet_ubuntu16-docker-weave-sep.yml b/tests/files/packet_ubuntu16-docker-weave-sep.yml
index e022b60a8..c49c6307e 100644
--- a/tests/files/packet_ubuntu16-docker-weave-sep.yml
+++ b/tests/files/packet_ubuntu16-docker-weave-sep.yml
@@ -10,3 +10,6 @@ auto_renew_certificates: true
 # Docker specific settings:
 container_manager: docker
 etcd_deployment_type: docker
+
+# Ubuntu 16 - docker containerd package available stopped at 1.4.6
+docker_containerd_version: latest