From 641a2a8bb4a18750ceb9525da26d91faf504f19a Mon Sep 17 00:00:00 2001
From: Maxime Guyot <Miouge1@users.noreply.github.com>
Date: Tue, 5 May 2020 16:17:09 +0200
Subject: [PATCH] Skip molecule tests for Ubuntu 18.04 (#6077)
---
.gitlab-ci/packet.yml | 9 ++++++++-
docs/ci.md | 2 +-
docs/integration.md | 2 +-
.../cri-o/molecule/default/molecule.yml | 12 ++++++------
tests/files/packet_centos7-crio.yml | 14 ++++++++++++++
5 files changed, 30 insertions(+), 9 deletions(-)
create mode 100644 tests/files/packet_centos7-crio.yml
diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
index 6357dfca3..66f80594c 100644
--- a/.gitlab-ci/packet.yml
+++ b/.gitlab-ci/packet.yml
@@ -29,13 +29,20 @@ packet_centos7-flannel-containerd-addons-ha:
variables:
MITOGEN_ENABLE: "true"
-packet_ubuntu18-crio:
+packet_centos7-crio:
extends: .packet
stage: deploy-part2
when: on_success
variables:
MITOGEN_ENABLE: "true"
+packet_ubuntu18-crio:
+ extends: .packet
+ stage: deploy-part2
+ when: manual
+ variables:
+ MITOGEN_ENABLE: "true"
+
packet_ubuntu16-canal-kubeadm-ha:
stage: deploy-part2
extends: .packet
diff --git a/docs/ci.md b/docs/ci.md
index a3777d3ee..2b6de8418 100644
--- a/docs/ci.md
+++ b/docs/ci.md
@@ -25,7 +25,7 @@ ubuntu20 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
| OS / CNI | calico | canal | cilium | contiv | flannel | kube-ovn | kube-router | macvlan | weave |
|---| --- | --- | --- | --- | --- | --- | --- | --- | --- |
amazon | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-centos7 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
+centos7 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
centos8 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
coreos | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
debian10 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
diff --git a/docs/integration.md b/docs/integration.md
index 57456c7ee..4eab2535b 100644
--- a/docs/integration.md
+++ b/docs/integration.md
@@ -7,7 +7,7 @@
2. Add **forked repo** as submodule to desired folder in your existent ansible repo(for example 3d/kubespray):
```git submodule add https://github.com/YOUR_GITHUB/kubespray.git kubespray```
- Git will create _.gitmodules_ file in your existent ansible repo:
+ Git will create `.gitmodules` file in your existent ansible repo:
```ini
[submodule "3d/kubespray"]
diff --git a/roles/container-engine/cri-o/molecule/default/molecule.yml b/roles/container-engine/cri-o/molecule/default/molecule.yml
index 06517b625..c0ab571cd 100644
--- a/roles/container-engine/cri-o/molecule/default/molecule.yml
+++ b/roles/container-engine/cri-o/molecule/default/molecule.yml
@@ -8,12 +8,12 @@ lint:
options:
config-file: ../../../.yamllint
platforms:
- - name: ubuntu1804
- box: generic/ubuntu1804
- cpus: 2
- memory: 1024
- groups:
- - kube-master
+ # - name: ubuntu1804
+ # box: generic/ubuntu1804
+ # cpus: 2
+ # memory: 1024
+ # groups:
+ # - kube-master
- name: centos7
box: centos/7
cpus: 2
diff --git a/tests/files/packet_centos7-crio.yml b/tests/files/packet_centos7-crio.yml
new file mode 100644
index 000000000..cfb745a67
--- /dev/null
+++ b/tests/files/packet_centos7-crio.yml
@@ -0,0 +1,14 @@
+---
+# Instance settings
+cloud_image: centos-7
+mode: default
+
+# Kubespray settings
+deploy_netchecker: true
+dns_min_replicas: 1
+container_manager: crio
+
+# CRI-O requirements
+download_container: false
+etcd_deployment_type: host
+kubelet_deployment_type: host
--
GitLab