CI: streamline packet jobs definition

- Take advantage of `parallel:matrix` to make the jobs definition shorter and more readable. - Remove helper scripts which are no longer needed - Remove redundant indirection in the gitlab-ci pipelines definitions (only one user)
2026-02-04 08:48:42 +03:00 · 2025-03-14 12:25:12 +01:00
parent 0f9f9fb569
commit 4f3b214ef5
66 changed files with 113 additions and 246 deletions
--- a/tests/files/packet_almalinux8-calico.yml
+++ b/tests/files/packet_almalinux8-calico.yml
--- a/tests/files/packet_almalinux9-calico-ha-ebpf.yml
+++ b/tests/files/packet_almalinux9-calico-ha-ebpf.yml
--- a/tests/files/packet_almalinux9-calico-nodelocaldns-secondary.yml
+++ b/tests/files/packet_almalinux9-calico-nodelocaldns-secondary.yml
--- a/tests/files/almalinux9-calico-remove-node
+++ b/tests/files/almalinux9-calico-remove-node
@@ -0,0 +1,2 @@
+REMOVE_NODE_CHECK=true
+REMOVE_NODE_NAME=instance-3
--- a/tests/files/packet_almalinux9-calico-remove-node.yml
+++ b/tests/files/packet_almalinux9-calico-remove-node.yml
--- a/tests/files/packet_almalinux9-calico.yml
+++ b/tests/files/packet_almalinux9-calico.yml
--- a/tests/files/packet_almalinux9-crio.yml
+++ b/tests/files/packet_almalinux9-crio.yml
--- a/tests/files/packet_almalinux9-docker.yml
+++ b/tests/files/packet_almalinux9-docker.yml
--- a/tests/files/packet_almalinux9-kube-ovn.yml
+++ b/tests/files/packet_almalinux9-kube-ovn.yml
--- a/tests/files/packet_amazon-linux-2-all-in-one.yml
+++ b/tests/files/packet_amazon-linux-2-all-in-one.yml
--- a/tests/files/packet_debian11-calico-collection.yml
+++ b/tests/files/packet_debian11-calico-collection.yml
--- a/tests/files/debian11-calico-upgrade
+++ b/tests/files/debian11-calico-upgrade
@@ -0,0 +1 @@
+UPGRADE_TEST=graceful
--- a/tests/files/debian11-calico-upgrade-once
+++ b/tests/files/debian11-calico-upgrade-once
@@ -0,0 +1 @@
+UPGRADE_TEST=graceful
--- a/tests/files/packet_debian11-calico-upgrade-once.yml
+++ b/tests/files/packet_debian11-calico-upgrade-once.yml
--- a/tests/files/packet_debian11-calico-upgrade.yml
+++ b/tests/files/packet_debian11-calico-upgrade.yml
--- a/tests/files/packet_debian11-custom-cni.yml
+++ b/tests/files/packet_debian11-custom-cni.yml
--- a/tests/files/packet_debian11-docker.yml
+++ b/tests/files/packet_debian11-docker.yml
--- a/tests/files/packet_debian11-kubelet-csr-approver.yml
+++ b/tests/files/packet_debian11-kubelet-csr-approver.yml
--- a/tests/files/packet_debian11-macvlan.yml
+++ b/tests/files/packet_debian11-macvlan.yml
--- a/tests/files/packet_debian12-calico.yml
+++ b/tests/files/packet_debian12-calico.yml
--- a/tests/files/packet_debian12-cilium-svc-proxy.yml
+++ b/tests/files/packet_debian12-cilium-svc-proxy.yml
--- a/tests/files/packet_debian12-cilium.yml
+++ b/tests/files/packet_debian12-cilium.yml
--- a/tests/files/packet_debian12-custom-cni-helm.yml
+++ b/tests/files/packet_debian12-custom-cni-helm.yml
--- a/tests/files/packet_debian12-docker.yml
+++ b/tests/files/packet_debian12-docker.yml
--- a/tests/files/packet_fedora39-calico-selinux.yml
+++ b/tests/files/packet_fedora39-calico-selinux.yml
--- a/tests/files/packet_fedora39-calico-swap-selinux.yml
+++ b/tests/files/packet_fedora39-calico-swap-selinux.yml
--- a/tests/files/packet_fedora39-crio.yml
+++ b/tests/files/packet_fedora39-crio.yml
--- a/tests/files/packet_fedora40-docker-calico.yml
+++ b/tests/files/packet_fedora40-docker-calico.yml
--- a/tests/files/fedora40-docker.calico
+++ b/tests/files/fedora40-docker.calico
@@ -0,0 +1 @@
+RESET_CHECK=true
--- a/tests/files/packet_openeuler24-calico.yml
+++ b/tests/files/packet_openeuler24-calico.yml
--- a/tests/files/packet_opensuse15-6-calico.yml
+++ b/tests/files/packet_opensuse15-6-calico.yml
--- a/tests/files/packet_opensuse15-6-docker-cilium.yml
+++ b/tests/files/packet_opensuse15-6-docker-cilium.yml
--- a/tests/files/packet_rockylinux8-calico.yml
+++ b/tests/files/packet_rockylinux8-calico.yml
--- a/tests/files/packet_rockylinux9-calico.yml
+++ b/tests/files/packet_rockylinux9-calico.yml
--- a/tests/files/rockylinux9-cilium
+++ b/tests/files/rockylinux9-cilium
@@ -0,0 +1 @@
+RESET_CHECK=true
--- a/tests/files/packet_rockylinux9-cilium.yml
+++ b/tests/files/packet_rockylinux9-cilium.yml
--- a/tests/files/packet_ubuntu20-all-in-one-docker.yml
+++ b/tests/files/packet_ubuntu20-all-in-one-docker.yml
--- a/tests/files/ubuntu20-calico-all-in-one
+++ b/tests/files/ubuntu20-calico-all-in-one
@@ -0,0 +1 @@
+RESET_CHECK=true
--- a/tests/files/packet_ubuntu20-calico-all-in-one-hardening.yml
+++ b/tests/files/packet_ubuntu20-calico-all-in-one-hardening.yml
--- a/tests/files/packet_ubuntu20-calico-all-in-one.yml
+++ b/tests/files/packet_ubuntu20-calico-all-in-one.yml
--- a/tests/files/ubuntu20-calico-etcd-kubeadm-upgrade-ha
+++ b/tests/files/ubuntu20-calico-etcd-kubeadm-upgrade-ha
@@ -0,0 +1 @@
+UPGRADE_TEST=basic
--- a/tests/files/packet_ubuntu20-calico-etcd-kubeadm-upgrade-ha.yml
+++ b/tests/files/packet_ubuntu20-calico-etcd-kubeadm-upgrade-ha.yml
--- a/tests/files/packet_ubuntu20-calico-etcd-kubeadm.yml
+++ b/tests/files/packet_ubuntu20-calico-etcd-kubeadm.yml
--- a/tests/files/ubuntu20-calico-ha-recover
+++ b/tests/files/ubuntu20-calico-ha-recover
@@ -0,0 +1,2 @@
+RECOVER_CONTROL_PLANE_TEST=true
+RECOVER_CONTROL_PLANE_TEST_GROUPS="etcd[2:]:kube_control_plane[1:]"
--- a/tests/files/ubuntu20-calico-ha-recover-noquorum
+++ b/tests/files/ubuntu20-calico-ha-recover-noquorum
@@ -0,0 +1,2 @@
+RECOVER_CONTROL_PLANE_TEST=true
+RECOVER_CONTROL_PLANE_TEST_GROUPS="etcd[1:]:kube_control_plane[1:]"
--- a/tests/files/packet_ubuntu20-calico-ha-recover-noquorum.yml
+++ b/tests/files/packet_ubuntu20-calico-ha-recover-noquorum.yml
--- a/tests/files/packet_ubuntu20-calico-ha-recover.yml
+++ b/tests/files/packet_ubuntu20-calico-ha-recover.yml
--- a/tests/files/packet_ubuntu20-calico-ha-wireguard.yml
+++ b/tests/files/packet_ubuntu20-calico-ha-wireguard.yml
--- a/tests/files/packet_ubuntu20-cilium-sep.yml
+++ b/tests/files/packet_ubuntu20-cilium-sep.yml
--- a/tests/files/packet_ubuntu20-crio.yml
+++ b/tests/files/packet_ubuntu20-crio.yml
--- a/tests/files/packet_ubuntu20-flannel-ha-once.yml
+++ b/tests/files/packet_ubuntu20-flannel-ha-once.yml
--- a/tests/files/packet_ubuntu20-flannel-ha.yml
+++ b/tests/files/packet_ubuntu20-flannel-ha.yml
--- a/tests/files/packet_ubuntu22-all-in-one-docker.yml
+++ b/tests/files/packet_ubuntu22-all-in-one-docker.yml
--- a/tests/files/ubuntu22-calico-all-in-one-upgrade
+++ b/tests/files/ubuntu22-calico-all-in-one-upgrade
@@ -0,0 +1 @@
+UPGRADE_TEST=graceful
--- a/tests/files/packet_ubuntu22-calico-all-in-one-upgrade.yml
+++ b/tests/files/packet_ubuntu22-calico-all-in-one-upgrade.yml
--- a/tests/files/packet_ubuntu22-calico-all-in-one.yml
+++ b/tests/files/packet_ubuntu22-calico-all-in-one.yml
--- a/tests/files/packet_ubuntu24-all-in-one-docker.yml
+++ b/tests/files/packet_ubuntu24-all-in-one-docker.yml
--- a/tests/files/packet_ubuntu24-calico-all-in-one.yml
+++ b/tests/files/packet_ubuntu24-calico-all-in-one.yml
--- a/tests/files/packet_ubuntu24-calico-etcd-datastore.yml
+++ b/tests/files/packet_ubuntu24-calico-etcd-datastore.yml