From 96aadc36149559c1524f847d6f850a40eafacb30 Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Thu, 13 Mar 2025 11:47:46 +0100 Subject: [PATCH] CI: only define `mode` in tests if needeed (#12030) All tests have a mode actually, so changing the default is no big deal (and makes more sense to have `default` as the default --- tests/cloud_playbooks/roles/packet-ci/defaults/main.yml | 2 +- tests/files/packet_almalinux8-calico.yml | 1 - tests/files/packet_almalinux9-calico-nodelocaldns-secondary.yml | 1 - tests/files/packet_almalinux9-calico.yml | 1 - tests/files/packet_almalinux9-crio.yml | 1 - tests/files/packet_almalinux9-docker.yml | 1 - tests/files/packet_almalinux9-kube-ovn.yml | 1 - tests/files/packet_debian11-calico-collection.yml | 1 - tests/files/packet_debian11-calico-upgrade-once.yml | 1 - tests/files/packet_debian11-calico-upgrade.yml | 1 - tests/files/packet_debian11-custom-cni.yml | 1 - tests/files/packet_debian11-docker.yml | 1 - tests/files/packet_debian11-kubelet-csr-approver.yml | 1 - tests/files/packet_debian11-macvlan.yml | 1 - tests/files/packet_debian12-calico.yml | 1 - tests/files/packet_debian12-cilium.yml | 1 - tests/files/packet_debian12-custom-cni-helm.yml | 1 - tests/files/packet_debian12-docker.yml | 1 - tests/files/packet_fedora39-calico-selinux.yml | 1 - tests/files/packet_fedora39-calico-swap-selinux.yml | 1 - tests/files/packet_fedora39-crio.yml | 1 - tests/files/packet_fedora40-docker-calico.yml | 1 - tests/files/packet_openeuler24-calico.yml | 1 - tests/files/packet_opensuse-docker-cilium.yml | 1 - tests/files/packet_rockylinux8-calico.yml | 1 - tests/files/packet_rockylinux9-calico.yml | 1 - tests/files/packet_rockylinux9-cilium.yml | 1 - tests/files/packet_ubuntu20-calico-etcd-kubeadm.yml | 1 - tests/files/packet_ubuntu20-crio.yml | 1 - tests/files/vagrant_fedora39-kube-router.yml | 1 - tests/files/vagrant_ubuntu24-calico-dual-stack.yml | 1 - tests/files/vagrant_ubuntu24-calico-ipv6only-stack.yml | 1 - 32 files changed, 1 insertion(+), 32 deletions(-) diff --git a/tests/cloud_playbooks/roles/packet-ci/defaults/main.yml b/tests/cloud_playbooks/roles/packet-ci/defaults/main.yml index 5ec7ce046..034233e3d 100644 --- a/tests/cloud_playbooks/roles/packet-ci/defaults/main.yml +++ b/tests/cloud_playbooks/roles/packet-ci/defaults/main.yml @@ -17,7 +17,7 @@ memory_allocation_ratio: 1 inventory_path: "/tmp/{{ test_name }}/inventory" # Deployment mode -mode: all-in-one +mode: default # Cloud init config for each os type # distro: fedora -> I2Nsb3VkLWNvbmZpZwpzeXN0ZW1faW5mbzoKICBkaXN0cm86IGZlZG9yYQp1c2VyczoKIC0gbmFtZToga3ViZXNwcmF5CiAgIGdyb3Vwczogd2hlZWwKICAgc3VkbzogJ0FMTD0oQUxMKSBOT1BBU1NXRDpBTEwnCiAgIHNoZWxsOiAvYmluL2Jhc2gKICAgbG9ja19wYXNzd2Q6IEZhbHNlCiAgIGhvbWU6IC9ob21lL2t1YmVzcHJheQogICBzc2hfYXV0aG9yaXplZF9rZXlzOgogICAgIC0gc3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFCQVFDYW5UaS9lS3gwK3RIWUpBZURocStzRlMyT2JVUDEvSTY5ZjdpVjNVdGtLbFQyMEpmVzFmNkZlWHQvMDRWZjI3V1FxK05xczZ2R0JxRDlRWFNZdWYrdDAvczdFUExqVGVpOW1lMW1wcXIrdVRlK0tEdFRQMzlwZkQzL2VWQ2FlQjcyNkdQMkZrYUQwRnpwbUViNjZPM05xaHhPUTk2R3gvOVhUdXcvSzNsbGo0T1ZENkdyalIzQjdjNFh0RUJzWmNacHBNSi9vSDFtR3lHWGRoMzFtV1FTcUFSTy9QOFU4R3d0MCtIR3BVd2gvaGR5M3QrU1lvVEIyR3dWYjB6b3lWd3RWdmZEUXpzbThmcTNhdjRLdmV6OGtZdU5ESnYwNXg0bHZVWmdSMTVaRFJYc0FuZGhReXFvWGRDTEFlMCtlYUtYcTlCa1d4S0ZiOWhQZTBBVWpqYTU= diff --git a/tests/files/packet_almalinux8-calico.yml b/tests/files/packet_almalinux8-calico.yml index c33e20bcd..a717f8862 100644 --- a/tests/files/packet_almalinux8-calico.yml +++ b/tests/files/packet_almalinux8-calico.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: almalinux-8 -mode: default vm_memory: 3072 # Workaround for RHEL8: kernel version 4.18 is lower than Kubernetes system verification. diff --git a/tests/files/packet_almalinux9-calico-nodelocaldns-secondary.yml b/tests/files/packet_almalinux9-calico-nodelocaldns-secondary.yml index b79bc5de9..c59056b18 100644 --- a/tests/files/packet_almalinux9-calico-nodelocaldns-secondary.yml +++ b/tests/files/packet_almalinux9-calico-nodelocaldns-secondary.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: almalinux-9 -mode: default vm_memory: 3072 # Kubespray settings diff --git a/tests/files/packet_almalinux9-calico.yml b/tests/files/packet_almalinux9-calico.yml index 6b4d87a98..2bffa26b6 100644 --- a/tests/files/packet_almalinux9-calico.yml +++ b/tests/files/packet_almalinux9-calico.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: almalinux-9 -mode: default vm_memory: 3072 # Kubespray settings diff --git a/tests/files/packet_almalinux9-crio.yml b/tests/files/packet_almalinux9-crio.yml index 5c5a8a8b1..d67d41de5 100644 --- a/tests/files/packet_almalinux9-crio.yml +++ b/tests/files/packet_almalinux9-crio.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: almalinux-9 -mode: default # Kubespray settings container_manager: crio diff --git a/tests/files/packet_almalinux9-docker.yml b/tests/files/packet_almalinux9-docker.yml index 569a1233b..4783eb4b5 100644 --- a/tests/files/packet_almalinux9-docker.yml +++ b/tests/files/packet_almalinux9-docker.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: almalinux-9 -mode: default vm_memory: 3072 # Use docker diff --git a/tests/files/packet_almalinux9-kube-ovn.yml b/tests/files/packet_almalinux9-kube-ovn.yml index 0f95165f8..7b0c985fc 100644 --- a/tests/files/packet_almalinux9-kube-ovn.yml +++ b/tests/files/packet_almalinux9-kube-ovn.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: almalinux-9 -mode: default vm_memory: 3072 # Kubespray settings diff --git a/tests/files/packet_debian11-calico-collection.yml b/tests/files/packet_debian11-calico-collection.yml index 61b31c20b..a9dd1d143 100644 --- a/tests/files/packet_debian11-calico-collection.yml +++ b/tests/files/packet_debian11-calico-collection.yml @@ -1,4 +1,3 @@ --- # Instance settings cloud_image: debian-11 -mode: default diff --git a/tests/files/packet_debian11-calico-upgrade-once.yml b/tests/files/packet_debian11-calico-upgrade-once.yml index 3c589a0bd..3b7ebf76d 100644 --- a/tests/files/packet_debian11-calico-upgrade-once.yml +++ b/tests/files/packet_debian11-calico-upgrade-once.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: debian-11 -mode: default # Kubespray settings download_run_once: true diff --git a/tests/files/packet_debian11-calico-upgrade.yml b/tests/files/packet_debian11-calico-upgrade.yml index 94aba7b92..d3bcf098c 100644 --- a/tests/files/packet_debian11-calico-upgrade.yml +++ b/tests/files/packet_debian11-calico-upgrade.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: debian-11 -mode: default # Pin disabling ipip mode to ensure proper upgrade ipip: false diff --git a/tests/files/packet_debian11-custom-cni.yml b/tests/files/packet_debian11-custom-cni.yml index 9eb717b22..aac9994ca 100644 --- a/tests/files/packet_debian11-custom-cni.yml +++ b/tests/files/packet_debian11-custom-cni.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: debian-11 -mode: default # Kubespray settings kube_owner: root diff --git a/tests/files/packet_debian11-docker.yml b/tests/files/packet_debian11-docker.yml index 69ec8eb25..ddce35e8b 100644 --- a/tests/files/packet_debian11-docker.yml +++ b/tests/files/packet_debian11-docker.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: debian-11 -mode: default # Use docker container_manager: docker diff --git a/tests/files/packet_debian11-kubelet-csr-approver.yml b/tests/files/packet_debian11-kubelet-csr-approver.yml index d1be09843..2d291bd46 100644 --- a/tests/files/packet_debian11-kubelet-csr-approver.yml +++ b/tests/files/packet_debian11-kubelet-csr-approver.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: debian-11 -mode: default # Kubespray settings kubelet_rotate_server_certificates: true diff --git a/tests/files/packet_debian11-macvlan.yml b/tests/files/packet_debian11-macvlan.yml index 3d8e9e24c..c343ea54c 100644 --- a/tests/files/packet_debian11-macvlan.yml +++ b/tests/files/packet_debian11-macvlan.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: debian-11 -mode: default # Kubespray settings kube_network_plugin: macvlan diff --git a/tests/files/packet_debian12-calico.yml b/tests/files/packet_debian12-calico.yml index 20e3f239f..e810c8747 100644 --- a/tests/files/packet_debian12-calico.yml +++ b/tests/files/packet_debian12-calico.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: debian-12 -mode: default # Kubespray settings diff --git a/tests/files/packet_debian12-cilium.yml b/tests/files/packet_debian12-cilium.yml index c77bcf33c..718f6de95 100644 --- a/tests/files/packet_debian12-cilium.yml +++ b/tests/files/packet_debian12-cilium.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: debian-12 -mode: default # Kubespray settings kube_network_plugin: cilium diff --git a/tests/files/packet_debian12-custom-cni-helm.yml b/tests/files/packet_debian12-custom-cni-helm.yml index 107c44dd3..f0a5666d2 100644 --- a/tests/files/packet_debian12-custom-cni-helm.yml +++ b/tests/files/packet_debian12-custom-cni-helm.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: debian-12 -mode: default # Kubespray settings kube_owner: root diff --git a/tests/files/packet_debian12-docker.yml b/tests/files/packet_debian12-docker.yml index 2a7406103..d46a4c7b0 100644 --- a/tests/files/packet_debian12-docker.yml +++ b/tests/files/packet_debian12-docker.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: debian-12 -mode: default # Use docker container_manager: docker diff --git a/tests/files/packet_fedora39-calico-selinux.yml b/tests/files/packet_fedora39-calico-selinux.yml index 18247117b..7181ba6a6 100644 --- a/tests/files/packet_fedora39-calico-selinux.yml +++ b/tests/files/packet_fedora39-calico-selinux.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: fedora-39 -mode: default # Kubespray settings auto_renew_certificates: true diff --git a/tests/files/packet_fedora39-calico-swap-selinux.yml b/tests/files/packet_fedora39-calico-swap-selinux.yml index f7743d688..f9527bc7d 100644 --- a/tests/files/packet_fedora39-calico-swap-selinux.yml +++ b/tests/files/packet_fedora39-calico-swap-selinux.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: fedora-39 -mode: default # Kubespray settings auto_renew_certificates: true diff --git a/tests/files/packet_fedora39-crio.yml b/tests/files/packet_fedora39-crio.yml index 97de63369..6fd50ffb4 100644 --- a/tests/files/packet_fedora39-crio.yml +++ b/tests/files/packet_fedora39-crio.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: fedora-39 -mode: default # Kubespray settings container_manager: crio diff --git a/tests/files/packet_fedora40-docker-calico.yml b/tests/files/packet_fedora40-docker-calico.yml index 36692fcf6..f0c091af8 100644 --- a/tests/files/packet_fedora40-docker-calico.yml +++ b/tests/files/packet_fedora40-docker-calico.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: fedora-40 -mode: default # Kubespray settings auto_renew_certificates: true diff --git a/tests/files/packet_openeuler24-calico.yml b/tests/files/packet_openeuler24-calico.yml index 203fef7b4..b728c9e76 100644 --- a/tests/files/packet_openeuler24-calico.yml +++ b/tests/files/packet_openeuler24-calico.yml @@ -1,5 +1,4 @@ --- # Instance settings cloud_image: openeuler-2403 -mode: default vm_memory: 3072 diff --git a/tests/files/packet_opensuse-docker-cilium.yml b/tests/files/packet_opensuse-docker-cilium.yml index 16ae3933a..5c456cf56 100644 --- a/tests/files/packet_opensuse-docker-cilium.yml +++ b/tests/files/packet_opensuse-docker-cilium.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: opensuse-leap-15 -mode: default # Kubespray settings kube_network_plugin: cilium diff --git a/tests/files/packet_rockylinux8-calico.yml b/tests/files/packet_rockylinux8-calico.yml index 87f9c0223..fc687ca0a 100644 --- a/tests/files/packet_rockylinux8-calico.yml +++ b/tests/files/packet_rockylinux8-calico.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: rockylinux-8 -mode: default vm_memory: 3072 # Kubespray settings diff --git a/tests/files/packet_rockylinux9-calico.yml b/tests/files/packet_rockylinux9-calico.yml index 5f3fcc5b0..2d223b790 100644 --- a/tests/files/packet_rockylinux9-calico.yml +++ b/tests/files/packet_rockylinux9-calico.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: rockylinux-9 -mode: default vm_memory: 3072 # Kubespray settings diff --git a/tests/files/packet_rockylinux9-cilium.yml b/tests/files/packet_rockylinux9-cilium.yml index 69d4c7377..ab4a52c75 100644 --- a/tests/files/packet_rockylinux9-cilium.yml +++ b/tests/files/packet_rockylinux9-cilium.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: rockylinux-9 -mode: default vm_memory: 3072 # Kubespray settings diff --git a/tests/files/packet_ubuntu20-calico-etcd-kubeadm.yml b/tests/files/packet_ubuntu20-calico-etcd-kubeadm.yml index ddc5cb556..62e94105d 100644 --- a/tests/files/packet_ubuntu20-calico-etcd-kubeadm.yml +++ b/tests/files/packet_ubuntu20-calico-etcd-kubeadm.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: ubuntu-2004 -mode: default # use the kubeadm etcd setting to test the upgrade etcd_deployment_type: kubeadm diff --git a/tests/files/packet_ubuntu20-crio.yml b/tests/files/packet_ubuntu20-crio.yml index 87329d058..d6667ec01 100644 --- a/tests/files/packet_ubuntu20-crio.yml +++ b/tests/files/packet_ubuntu20-crio.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: ubuntu-2004 -mode: default # Kubespray settings container_manager: crio diff --git a/tests/files/vagrant_fedora39-kube-router.yml b/tests/files/vagrant_fedora39-kube-router.yml index 71bcc5fe5..b09c4889f 100644 --- a/tests/files/vagrant_fedora39-kube-router.yml +++ b/tests/files/vagrant_fedora39-kube-router.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: fedora-39 -mode: default # Kubespray settings kube_network_plugin: kube-router diff --git a/tests/files/vagrant_ubuntu24-calico-dual-stack.yml b/tests/files/vagrant_ubuntu24-calico-dual-stack.yml index 7cdbbe6c3..d7f5cc9ba 100644 --- a/tests/files/vagrant_ubuntu24-calico-dual-stack.yml +++ b/tests/files/vagrant_ubuntu24-calico-dual-stack.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: ubuntu-2404 -mode: default # Kubespray settings ipv4_stack: true diff --git a/tests/files/vagrant_ubuntu24-calico-ipv6only-stack.yml b/tests/files/vagrant_ubuntu24-calico-ipv6only-stack.yml index 74d93cf63..e8aa5806a 100644 --- a/tests/files/vagrant_ubuntu24-calico-ipv6only-stack.yml +++ b/tests/files/vagrant_ubuntu24-calico-ipv6only-stack.yml @@ -1,7 +1,6 @@ --- # Instance settings cloud_image: ubuntu-2404 -mode: default # Kubespray settings ipv4_stack: false