From 69a48cbdd7e5f3cf8b3bc1c21d36ac39c9a19ae8 Mon Sep 17 00:00:00 2001 From: Maxime Guyot Date: Thu, 18 Jun 2020 10:18:05 +0200 Subject: [PATCH] Add Vagrant CI for Ubuntu 20.04 (#6279) --- .gitlab-ci/vagrant.yml | 5 +++++ docs/ci.md | 2 +- tests/files/vagrant_ubuntu20-flannel.rb | 9 +++++++++ tests/files/vagrant_ubuntu20-flannel.yml | 7 +++++++ 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 tests/files/vagrant_ubuntu20-flannel.rb create mode 100644 tests/files/vagrant_ubuntu20-flannel.yml diff --git a/.gitlab-ci/vagrant.yml b/.gitlab-ci/vagrant.yml index 596e06be3..fcc5de459 100644 --- a/.gitlab-ci/vagrant.yml +++ b/.gitlab-ci/vagrant.yml @@ -47,3 +47,8 @@ vagrant_ubuntu18-weave-medium: stage: deploy-part2 extends: .vagrant when: manual + +vagrant_ubuntu20-flannel: + stage: deploy-part2 + extends: .vagrant + when: on_success \ No newline at end of file diff --git a/docs/ci.md b/docs/ci.md index 831bd159e..6649cd98e 100644 --- a/docs/ci.md +++ b/docs/ci.md @@ -17,7 +17,7 @@ opensuse | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | oracle7 | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | ubuntu16 | :x: | :white_check_mark: | :x: | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: | ubuntu18 | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | -ubuntu20 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +ubuntu20 | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | ## crio diff --git a/tests/files/vagrant_ubuntu20-flannel.rb b/tests/files/vagrant_ubuntu20-flannel.rb new file mode 100644 index 000000000..c739f58a2 --- /dev/null +++ b/tests/files/vagrant_ubuntu20-flannel.rb @@ -0,0 +1,9 @@ +$os = "ubuntu2004" + +# For CI we are not worries about data persistence across reboot +$libvirt_volume_cache = "unsafe" + +# Checking for box update can trigger API rate limiting +# https://www.vagrantup.com/docs/vagrant-cloud/request-limits.html +$box_check_update = false +$vm_cpus = 2 \ No newline at end of file diff --git a/tests/files/vagrant_ubuntu20-flannel.yml b/tests/files/vagrant_ubuntu20-flannel.yml new file mode 100644 index 000000000..e878a5e38 --- /dev/null +++ b/tests/files/vagrant_ubuntu20-flannel.yml @@ -0,0 +1,7 @@ +--- +# Kubespray settings + +kube_network_plugin: flannel + +deploy_netchecker: true +dns_min_replicas: 1 \ No newline at end of file