diff --git a/roles/container-engine/containerd/molecule/default/molecule.yml b/roles/container-engine/containerd/molecule/default/molecule.yml index 0ad3b7946..e4a4491e6 100644 --- a/roles/container-engine/containerd/molecule/default/molecule.yml +++ b/roles/container-engine/containerd/molecule/default/molecule.yml @@ -35,5 +35,6 @@ provisioner: timeout: 120 playbooks: create: ../../../../../tests/cloud_playbooks/create-kubevirt.yml + prepare: ../../../molecule/prepare.yml verifier: name: testinfra diff --git a/roles/container-engine/cri-dockerd/molecule/default/molecule.yml b/roles/container-engine/cri-dockerd/molecule/default/molecule.yml index cff276e42..83384d738 100644 --- a/roles/container-engine/cri-dockerd/molecule/default/molecule.yml +++ b/roles/container-engine/cri-dockerd/molecule/default/molecule.yml @@ -27,5 +27,6 @@ provisioner: become: true playbooks: create: ../../../../../tests/cloud_playbooks/create-kubevirt.yml + prepare: ../../../molecule/prepare.yml verifier: name: testinfra diff --git a/roles/container-engine/cri-dockerd/molecule/default/prepare.yml b/roles/container-engine/cri-dockerd/molecule/default/prepare.yml deleted file mode 100644 index dc470a567..000000000 --- a/roles/container-engine/cri-dockerd/molecule/default/prepare.yml +++ /dev/null @@ -1,48 +0,0 @@ ---- -- name: Prepare - hosts: all - become: true - roles: - - role: kubespray_defaults - - role: bootstrap_os - - role: adduser - user: "{{ addusers.kube }}" - tasks: - - name: Download CNI - include_tasks: "../../../../download/tasks/download_file.yml" - vars: - download: "{{ download_defaults | combine(downloads.cni) }}" - -- name: Prepare container runtime - hosts: all - become: true - vars: - container_manager: containerd - kube_network_plugin: cni - roles: - - role: kubespray_defaults - - role: network_plugin/cni - tasks: - - name: Copy test container files - copy: - src: "{{ item }}" - dest: "/tmp/{{ item }}" - owner: root - mode: "0644" - with_items: - - container.json - - sandbox.json - - name: Create /etc/cni/net.d directory - file: - path: /etc/cni/net.d - state: directory - owner: "{{ kube_owner }}" - mode: "0755" - - name: Setup CNI - copy: - src: "{{ item }}" - dest: "/etc/cni/net.d/{{ item }}" - owner: root - mode: "0644" - with_items: - - 10-mynet.conf diff --git a/roles/container-engine/cri-o/molecule/default/molecule.yml b/roles/container-engine/cri-o/molecule/default/molecule.yml index cc7ce3af7..68f181477 100644 --- a/roles/container-engine/cri-o/molecule/default/molecule.yml +++ b/roles/container-engine/cri-o/molecule/default/molecule.yml @@ -43,5 +43,6 @@ provisioner: timeout: 120 playbooks: create: ../../../../../tests/cloud_playbooks/create-kubevirt.yml + prepare: ../../../molecule/prepare.yml verifier: name: testinfra diff --git a/roles/container-engine/cri-o/molecule/default/prepare.yml b/roles/container-engine/cri-o/molecule/default/prepare.yml deleted file mode 100644 index 6fa4d3d71..000000000 --- a/roles/container-engine/cri-o/molecule/default/prepare.yml +++ /dev/null @@ -1,54 +0,0 @@ ---- -- name: Prepare - hosts: all - gather_facts: false - become: true - vars: - ignore_assert_errors: true - roles: - - role: kubespray_defaults - - role: bootstrap_os - - role: network_facts - - role: kubernetes/preinstall - - role: adduser - user: "{{ addusers.kube }}" - tasks: - - name: Download CNI - include_tasks: "../../../../download/tasks/download_file.yml" - vars: - download: "{{ download_defaults | combine(downloads.cni) }}" - -- name: Prepare CNI - hosts: all - gather_facts: false - become: true - vars: - ignore_assert_errors: true - kube_network_plugin: cni - roles: - - role: kubespray_defaults - - role: network_plugin/cni - tasks: - - name: Copy test container files - copy: - src: "{{ item }}" - dest: "/tmp/{{ item }}" - owner: root - mode: "0644" - with_items: - - container.json - - sandbox.json - - name: Create /etc/cni/net.d directory - file: - path: /etc/cni/net.d - state: directory - owner: "{{ kube_owner }}" - mode: "0755" - - name: Setup CNI - copy: - src: "{{ item }}" - dest: "/etc/cni/net.d/{{ item }}" - owner: root - mode: "0644" - with_items: - - 10-mynet.conf diff --git a/roles/container-engine/gvisor/molecule/default/molecule.yml b/roles/container-engine/gvisor/molecule/default/molecule.yml index 9bf496331..543f5441e 100644 --- a/roles/container-engine/gvisor/molecule/default/molecule.yml +++ b/roles/container-engine/gvisor/molecule/default/molecule.yml @@ -1,28 +1,18 @@ --- role_name_check: 1 -driver: - name: vagrant - provider: - name: libvirt platforms: - - name: ubuntu20 - box: generic/ubuntu2004 - cpus: 1 - memory: 1024 - nested: true - groups: + - cloud_image: ubuntu-2004 + name: ubuntu20 + vm_cpu_cores: 1 + vm_memory: 1024 + node_groups: - kube_control_plane - provider_options: - driver: kvm - name: almalinux9 - box: almalinux/9 - cpus: 1 - memory: 1024 - nested: true - groups: + cloud_image: almalinux-9 + vm_cpu_cores: 1 + vm_memory: 1024 + node_groups: - kube_control_plane - provider_options: - driver: kvm provisioner: name: ansible env: @@ -31,9 +21,8 @@ provisioner: defaults: callbacks_enabled: profile_tasks timeout: 120 - inventory: - group_vars: - all: - become: true + playbooks: + create: ../../../../../tests/cloud_playbooks/create-kubevirt.yml + prepare: ../../../molecule/prepare.yml verifier: name: testinfra diff --git a/roles/container-engine/gvisor/molecule/default/prepare.yml b/roles/container-engine/gvisor/molecule/default/prepare.yml deleted file mode 100644 index 0dc4e4e35..000000000 --- a/roles/container-engine/gvisor/molecule/default/prepare.yml +++ /dev/null @@ -1,49 +0,0 @@ ---- -- name: Prepare generic - hosts: all - become: true - roles: - - role: kubespray_defaults - - role: bootstrap_os - - role: adduser - user: "{{ addusers.kube }}" - tasks: - - name: Download CNI - include_tasks: "../../../../download/tasks/download_file.yml" - vars: - download: "{{ download_defaults | combine(downloads.cni) }}" - -- name: Prepare container runtime - hosts: all - become: true - vars: - container_manager: containerd - kube_network_plugin: cni - roles: - - role: kubespray_defaults - - role: network_plugin/cni - - role: container-engine/crictl - tasks: - - name: Copy test container files - copy: - src: "{{ item }}" - dest: "/tmp/{{ item }}" - owner: root - mode: "0644" - with_items: - - container.json - - sandbox.json - - name: Create /etc/cni/net.d directory - file: - path: /etc/cni/net.d - state: directory - owner: root - mode: "0755" - - name: Setup CNI - copy: - src: "{{ item }}" - dest: "/etc/cni/net.d/{{ item }}" - owner: root - mode: "0644" - with_items: - - 10-mynet.conf diff --git a/roles/container-engine/kata-containers/molecule/default/molecule.yml b/roles/container-engine/kata-containers/molecule/default/molecule.yml index 8eaa5d7b8..c5b312a36 100644 --- a/roles/container-engine/kata-containers/molecule/default/molecule.yml +++ b/roles/container-engine/kata-containers/molecule/default/molecule.yml @@ -1,28 +1,18 @@ --- role_name_check: 1 -driver: - name: vagrant - provider: - name: libvirt platforms: - name: ubuntu20 - box: generic/ubuntu2004 - cpus: 1 - memory: 1024 - nested: true - groups: + cloud_image: ubuntu-2004 + vm_cpu_cores: 1 + vm_memory: 1024 + node_groups: - kube_control_plane - provider_options: - driver: kvm - name: ubuntu22 - box: generic/ubuntu2204 - cpus: 1 - memory: 1024 - nested: true - groups: + cloud_image: ubuntu-2204 + vm_cpu_cores: 1 + vm_memory: 1024 + node_groups: - kube_control_plane - provider_options: - driver: kvm provisioner: name: ansible env: @@ -31,9 +21,8 @@ provisioner: defaults: callbacks_enabled: profile_tasks timeout: 120 - inventory: - group_vars: - all: - become: true + playbooks: + create: ../../../../../tests/cloud_playbooks/create-kubevirt.yml + prepare: ../../../molecule/prepare.yml verifier: name: testinfra diff --git a/roles/container-engine/kata-containers/molecule/default/prepare.yml b/roles/container-engine/kata-containers/molecule/default/prepare.yml deleted file mode 100644 index 8578e092c..000000000 --- a/roles/container-engine/kata-containers/molecule/default/prepare.yml +++ /dev/null @@ -1,49 +0,0 @@ ---- -- name: Prepare - hosts: all - become: true - roles: - - role: kubespray_defaults - - role: bootstrap_os - - role: adduser - user: "{{ addusers.kube }}" - tasks: - - name: Download CNI - include_tasks: "../../../../download/tasks/download_file.yml" - vars: - download: "{{ download_defaults | combine(downloads.cni) }}" - -- name: Prepare container runtime - hosts: all - become: true - vars: - container_manager: containerd - kube_network_plugin: cni - roles: - - role: kubespray_defaults - - role: network_plugin/cni - - role: container-engine/crictl - tasks: - - name: Copy test container files - copy: - src: "{{ item }}" - dest: "/tmp/{{ item }}" - owner: root - mode: "0644" - with_items: - - container.json - - sandbox.json - - name: Create /etc/cni/net.d directory - file: - path: /etc/cni/net.d - state: directory - owner: "{{ kube_owner }}" - mode: "0755" - - name: Setup CNI - copy: - src: "{{ item }}" - dest: "/etc/cni/net.d/{{ item }}" - owner: root - mode: "0644" - with_items: - - 10-mynet.conf diff --git a/roles/container-engine/containerd/molecule/default/prepare.yml b/roles/container-engine/molecule/prepare.yml similarity index 90% rename from roles/container-engine/containerd/molecule/default/prepare.yml rename to roles/container-engine/molecule/prepare.yml index 54a3ce122..9faf3a865 100644 --- a/roles/container-engine/containerd/molecule/default/prepare.yml +++ b/roles/container-engine/molecule/prepare.yml @@ -6,7 +6,7 @@ vars: ignore_assert_errors: true roles: - - role: kubespray_defaults + - role: dynamic_groups - role: bootstrap_os - role: network_facts - role: kubernetes/preinstall @@ -14,7 +14,7 @@ user: "{{ addusers.kube }}" tasks: - name: Download CNI - include_tasks: "../../../../download/tasks/download_file.yml" + include_tasks: "../../download/tasks/download_file.yml" vars: download: "{{ download_defaults | combine(downloads.cni) }}" diff --git a/roles/container-engine/youki/molecule/default/molecule.yml b/roles/container-engine/youki/molecule/default/molecule.yml index 9bf496331..543f5441e 100644 --- a/roles/container-engine/youki/molecule/default/molecule.yml +++ b/roles/container-engine/youki/molecule/default/molecule.yml @@ -1,28 +1,18 @@ --- role_name_check: 1 -driver: - name: vagrant - provider: - name: libvirt platforms: - - name: ubuntu20 - box: generic/ubuntu2004 - cpus: 1 - memory: 1024 - nested: true - groups: + - cloud_image: ubuntu-2004 + name: ubuntu20 + vm_cpu_cores: 1 + vm_memory: 1024 + node_groups: - kube_control_plane - provider_options: - driver: kvm - name: almalinux9 - box: almalinux/9 - cpus: 1 - memory: 1024 - nested: true - groups: + cloud_image: almalinux-9 + vm_cpu_cores: 1 + vm_memory: 1024 + node_groups: - kube_control_plane - provider_options: - driver: kvm provisioner: name: ansible env: @@ -31,9 +21,8 @@ provisioner: defaults: callbacks_enabled: profile_tasks timeout: 120 - inventory: - group_vars: - all: - become: true + playbooks: + create: ../../../../../tests/cloud_playbooks/create-kubevirt.yml + prepare: ../../../molecule/prepare.yml verifier: name: testinfra diff --git a/roles/container-engine/youki/molecule/default/prepare.yml b/roles/container-engine/youki/molecule/default/prepare.yml deleted file mode 100644 index e6272ca5d..000000000 --- a/roles/container-engine/youki/molecule/default/prepare.yml +++ /dev/null @@ -1,49 +0,0 @@ ---- -- name: Prepare generic - hosts: all - become: true - roles: - - role: kubespray_defaults - - role: bootstrap_os - - role: adduser - user: "{{ addusers.kube }}" - tasks: - - name: Download CNI - include_tasks: "../../../../download/tasks/download_file.yml" - vars: - download: "{{ download_defaults | combine(downloads.cni) }}" - -- name: Prepare container runtime - hosts: all - become: true - vars: - container_manager: crio - kube_network_plugin: cni - roles: - - role: kubespray_defaults - - role: network_plugin/cni - - role: container-engine/crictl - tasks: - - name: Copy test container files - copy: - src: "{{ item }}" - dest: "/tmp/{{ item }}" - owner: root - mode: "0644" - with_items: - - container.json - - sandbox.json - - name: Create /etc/cni/net.d directory - file: - path: /etc/cni/net.d - state: directory - owner: root - mode: "0755" - - name: Setup CNI - copy: - src: "{{ item }}" - dest: "/etc/cni/net.d/{{ item }}" - owner: root - mode: "0644" - with_items: - - 10-mynet.conf