diff --git a/tests/cloud_playbooks/roles/packet-ci/tasks/create-vms.yml b/tests/cloud_playbooks/roles/packet-ci/tasks/create-vms.yml index d939db02ceeefd05760d1efbc10bb86964bd0d72..bf63c91793ad366dce6100ca608907cfc758dbf9 100644 --- a/tests/cloud_playbooks/roles/packet-ci/tasks/create-vms.yml +++ b/tests/cloud_playbooks/roles/packet-ci/tasks/create-vms.yml @@ -1,12 +1,8 @@ --- - name: "Create CI namespace {{ test_name }} for test vms" - k8s: - name: "{{ test_name }}" - kind: Namespace - state: present - register: create_ci_ns - failed_when: not create_ci_ns.changed + command: "kubectl create namespace {{ test_name }}" + changed_when: false - name: "Create temp dir /tmp/{{ test_name }} for CI files" file: @@ -24,9 +20,8 @@ index_var: vm_id - name: Start vms for CI job - k8s: - state: present - src: "/tmp/{{ test_name }}/instance-{{ vm_id }}.yml" + command: "kubectl apply -f /tmp/{{ test_name }}/instance-{{ vm_id }}.yml" + changed_when: false loop: "{{ range(1, vm_count|int + 1, 1) | list }}" loop_control: index_var: vm_id diff --git a/tests/cloud_playbooks/roles/packet-ci/tasks/delete-vms.yml b/tests/cloud_playbooks/roles/packet-ci/tasks/delete-vms.yml index f327cd32fbd6ad1644749e74ffb29aa6ab944208..353f9910a345967051857db6e9d164568a215cc0 100644 --- a/tests/cloud_playbooks/roles/packet-ci/tasks/delete-vms.yml +++ b/tests/cloud_playbooks/roles/packet-ci/tasks/delete-vms.yml @@ -14,10 +14,8 @@ state: absent - name: "Cleanup namespace for {{ test_name }}" - k8s: - kind: Namespace - state: absent - name: "{{ test_name }}" + command: "kubectl delete namespace {{ test_name }}" + changed_when: false - name: Wait for namespace {{ test_name }} to be fully deleted command: kubectl get ns {{ test_name }} diff --git a/tests/requirements-2.10.txt b/tests/requirements-2.10.txt index 03f0aa0fa5eabc02b9c53f3e4d06a1b2e22536a5..287e352ad2f8cbfdf67212d190fceb1075731071 100644 --- a/tests/requirements-2.10.txt +++ b/tests/requirements-2.10.txt @@ -5,7 +5,6 @@ tox==3.11.1 dopy==0.3.7 cryptography==2.8 ansible-lint==5.4.0 -openshift==0.8.8 molecule==3.0.6 molecule-vagrant==0.3 testinfra==5.2.2 diff --git a/tests/requirements-2.11.txt b/tests/requirements-2.11.txt index a652be39eb8ab00b9b13c7ae3658071cd0e73d6e..c97efdc4c409cbc4318983222beefbf0f2aa5671 100644 --- a/tests/requirements-2.11.txt +++ b/tests/requirements-2.11.txt @@ -5,7 +5,6 @@ tox==3.11.1 dopy==0.3.7 cryptography==2.8 ansible-lint==5.4.0 -openshift==0.8.8 molecule==3.0.6 molecule-vagrant==0.3 testinfra==5.2.2 diff --git a/tests/requirements-2.9.txt b/tests/requirements-2.9.txt index dff1f6612a8ee5a740a1476fd7145aa7b837b889..3e137ac4918bb1f3ea930596a9b8ad67492baf7a 100644 --- a/tests/requirements-2.9.txt +++ b/tests/requirements-2.9.txt @@ -6,7 +6,6 @@ dopy==0.3.7 cryptography==2.8 ansible-lint==5.4.0 ; python_version >= '3.0' ansible-lint==4.2.0 ; python_version < '3.0' -openshift==0.8.8 molecule==3.0.6 ; python_version >= '3.0' molecule==3.0.2 ; python_version < '3.0' molecule-vagrant==0.3