tests: replace ubuntu18 with ubuntu20

Signed-off-by: Arthur Outhenin-Chalandre <[email protected]>
kubernetes-sigs · May 19, 2023 · 22c071f · 22c071f
1 parent 687f25f
commit 22c071f
Show file tree

Hide file tree

Showing 19 changed files with 18 additions and 85 deletions.
diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
@@ -41,11 +41,6 @@ packet_ubuntu20-calico-aio-ansible-2_11:
 
 # ### PR JOBS PART2
 
-packet_ubuntu18-aio-docker:
-  stage: deploy-part2
-  extends: .packet_pr
-  when: on_success
-
 packet_ubuntu20-aio-docker:
   stage: deploy-part2
   extends: .packet_pr
@@ -56,11 +51,6 @@ packet_ubuntu20-calico-aio-hardening:
   extends: .packet_pr
   when: on_success
 
-packet_ubuntu18-calico-aio:
-  stage: deploy-part2
-  extends: .packet_pr
-  when: on_success
-
 packet_ubuntu22-aio-docker:
   stage: deploy-part2
   extends: .packet_pr
@@ -81,7 +71,7 @@ packet_almalinux8-crio:
   stage: deploy-part2
   when: on_success
 
-packet_ubuntu18-crio:
+packet_ubuntu20-crio:
   extends: .packet_pr
   stage: deploy-part2
   when: manual
@@ -180,17 +170,12 @@ packet_ubuntu20-docker-weave-sep:
   extends: .packet_pr
   when: manual
 
-packet_ubuntu18-cilium-sep:
+packet_ubuntu20-cilium-sep:
   stage: deploy-special
   extends: .packet_pr
   when: manual
 
-packet_ubuntu18-flannel-ha:
-  stage: deploy-part2
-  extends: .packet_pr
-  when: manual
-
-packet_ubuntu18-flannel-ha-once:
+packet_ubuntu20-flannel-ha-once:
   stage: deploy-part2
   extends: .packet_pr
   when: manual
@@ -308,15 +293,15 @@ packet_debian11-calico-upgrade-once:
   variables:
     UPGRADE_TEST: graceful
 
-packet_ubuntu18-calico-ha-recover:
+packet_ubuntu20-calico-ha-recover:
   stage: deploy-part3
   extends: .packet_periodic
   when: on_success
   variables:
     RECOVER_CONTROL_PLANE_TEST: "true"
     RECOVER_CONTROL_PLANE_TEST_GROUPS: "etcd[2:],kube_control_plane[1:]"
 
-packet_ubuntu18-calico-ha-recover-noquorum:
+packet_ubuntu20-calico-ha-recover-noquorum:
   stage: deploy-part3
   extends: .packet_periodic
   when: on_success

diff --git a/.gitlab-ci/terraform.yml b/.gitlab-ci/terraform.yml
@@ -100,7 +100,7 @@ tf-validate-upcloud:
     PROVIDER: upcloud
     CLUSTER: $CI_COMMIT_REF_NAME
 
-# tf-packet-ubuntu18-default:
+# tf-packet-ubuntu20-default:
 #   extends: .terraform_apply
 #   variables:
 #     TF_VERSION: $TERRAFORM_VERSION
@@ -112,7 +112,7 @@ tf-validate-upcloud:
 #     TF_VAR_plan_k8s_nodes: t1.small.x86
 #     TF_VAR_facility: ams1
 #     TF_VAR_public_key_path: ""
-#     TF_VAR_operating_system: ubuntu_18_04
+#     TF_VAR_operating_system: ubuntu_20_04
 
 .ovh_variables: &ovh_variables
   OS_AUTH_URL: https://auth.cloud.ovh.net/v3
@@ -150,7 +150,7 @@ tf-elastx_cleanup:
   script:
     - ./scripts/openstack-cleanup/main.py
 
-tf-elastx_ubuntu18-calico:
+tf-elastx_ubuntu20-calico:
   extends: .terraform_apply
   stage: deploy-part3
   when: on_success
@@ -197,7 +197,7 @@ tf-elastx_ubuntu18-calico:
 #  script:
 #    - ./scripts/openstack-cleanup/main.py
 
-# tf-ovh_ubuntu18-calico:
+# tf-ovh_ubuntu20-calico:
 #  extends: .terraform_apply
 #  when: on_success
 #  environment: ovh
@@ -223,5 +223,5 @@ tf-elastx_ubuntu18-calico:
 #    TF_VAR_network_name: "Ext-Net"
 #    TF_VAR_flavor_k8s_master: "defa64c3-bd46-43b4-858a-d93bbae0a229"    # s1-8
 #    TF_VAR_flavor_k8s_node: "defa64c3-bd46-43b4-858a-d93bbae0a229"      # s1-8
-#    TF_VAR_image: "Ubuntu 18.04"
+#    TF_VAR_image: "Ubuntu 20.04"
 #    TF_VAR_k8s_allowed_remote_ips: '["0.0.0.0/0"]'
diff --git a/.gitlab-ci/vagrant.yml b/.gitlab-ci/vagrant.yml
@@ -24,17 +24,12 @@
     - chronic ./tests/scripts/testcases_cleanup.sh
   allow_failure: true
 
-vagrant_ubuntu18-calico-dual-stack:
+vagrant_ubuntu20-calico-dual-stack:
   stage: deploy-part2
   extends: .vagrant
   when: on_success
 
-vagrant_ubuntu18-flannel:
-  stage: deploy-part2
-  extends: .vagrant
-  when: on_success
-
-vagrant_ubuntu18-weave-medium:
+vagrant_ubuntu20-weave-medium:
   stage: deploy-part2
   extends: .vagrant
   when: manual

diff --git a/tests/files/packet_ubuntu18-aio-docker.yml b/tests/files/packet_ubuntu18-aio-docker.yml
diff --git a/tests/files/packet_ubuntu18-calico-aio.yml b/tests/files/packet_ubuntu18-calico-aio.yml
diff --git a/tests/files/packet_ubuntu18-flannel-ha.yml b/tests/files/packet_ubuntu18-flannel-ha.yml
diff --git a/...t_ubuntu18-calico-ha-recover-noquorum.yml → ...t_ubuntu20-calico-ha-recover-noquorum.yml b/...t_ubuntu18-calico-ha-recover-noquorum.yml → ...t_ubuntu20-calico-ha-recover-noquorum.yml
@@ -1,4 +1,4 @@
 ---
 # Instance settings
-cloud_image: ubuntu-1804
+cloud_image: ubuntu-2004
 mode: ha-recover-noquorum
diff --git a/...les/packet_ubuntu18-calico-ha-recover.yml → ...les/packet_ubuntu20-calico-ha-recover.yml b/...les/packet_ubuntu18-calico-ha-recover.yml → ...les/packet_ubuntu20-calico-ha-recover.yml
@@ -1,4 +1,4 @@
 ---
 # Instance settings
-cloud_image: ubuntu-1804
+cloud_image: ubuntu-2004
 mode: ha-recover
diff --git a/tests/files/packet_ubuntu18-cilium-sep.yml → tests/files/packet_ubuntu20-cilium-sep.yml b/tests/files/packet_ubuntu18-cilium-sep.yml → tests/files/packet_ubuntu20-cilium-sep.yml
@@ -1,6 +1,6 @@
 ---
 # Instance settings
-cloud_image: ubuntu-1804
+cloud_image: ubuntu-2004
 mode: separate
 
 # Kubespray settings

diff --git a/tests/files/packet_ubuntu18-crio.yml → tests/files/packet_ubuntu20-crio.yml b/tests/files/packet_ubuntu18-crio.yml → tests/files/packet_ubuntu20-crio.yml
@@ -1,6 +1,6 @@
 ---
 # Instance settings
-cloud_image: ubuntu-1804
+cloud_image: ubuntu-2004
 mode: default
 
 # Kubespray settings

diff --git a/...files/packet_ubuntu18-flannel-ha-once.yml → ...files/packet_ubuntu20-flannel-ha-once.yml b/...files/packet_ubuntu18-flannel-ha-once.yml → ...files/packet_ubuntu20-flannel-ha-once.yml
@@ -1,6 +1,6 @@
 ---
 # Instance settings
-cloud_image: ubuntu-1804
+cloud_image: ubuntu-2004
 mode: ha
 
 # Kubespray settings

diff --git a/tests/files/tf-elastx_ubuntu18-calico.yml → tests/files/tf-elastx_ubuntu20-calico.yml b/tests/files/tf-elastx_ubuntu18-calico.yml → tests/files/tf-elastx_ubuntu20-calico.yml
diff --git a/tests/files/tf-ovh_ubuntu18-calico.yml → tests/files/tf-ovh_ubuntu20-calico.yml b/tests/files/tf-ovh_ubuntu18-calico.yml → tests/files/tf-ovh_ubuntu20-calico.yml
diff --git a/tests/files/vagrant_ubuntu18-flannel.rb b/tests/files/vagrant_ubuntu18-flannel.rb
diff --git a/tests/files/vagrant_ubuntu18-flannel.yml b/tests/files/vagrant_ubuntu18-flannel.yml
diff --git a/...les/vagrant_ubuntu18-calico-dual-stack.rb → ...les/vagrant_ubuntu20-calico-dual-stack.rb b/...les/vagrant_ubuntu18-calico-dual-stack.rb → ...les/vagrant_ubuntu20-calico-dual-stack.rb
diff --git a/...es/vagrant_ubuntu18-calico-dual-stack.yml → ...es/vagrant_ubuntu20-calico-dual-stack.yml b/...es/vagrant_ubuntu18-calico-dual-stack.yml → ...es/vagrant_ubuntu20-calico-dual-stack.yml
diff --git a/tests/files/vagrant_ubuntu18-weave-medium.rb → tests/files/vagrant_ubuntu20-weave-medium.rb b/tests/files/vagrant_ubuntu18-weave-medium.rb → tests/files/vagrant_ubuntu20-weave-medium.rb
@@ -1,6 +1,6 @@
 $num_instances = 16
 $vm_memory ||= 2048
-$os = "ubuntu1804"
+$os = "ubuntu2004"
 $network_plugin = "weave"
 $kube_master_instances = 1
 $etcd_instances = 1

diff --git a/...s/files/vagrant_ubuntu18-weave-medium.yml → ...s/files/vagrant_ubuntu20-weave-medium.yml b/...s/files/vagrant_ubuntu18-weave-medium.yml → ...s/files/vagrant_ubuntu20-weave-medium.yml