[CI] remove docker stand-alone molecule test

.gitlab-ci/molecule.yml

@@ -44,7 +44,7 @@ molecule_no_container_engines:
 molecule_docker:
   extends: .molecule
   script:
-    - ./tests/scripts/molecule_run.sh -i container-engine/docker
+    - ./tests/scripts/molecule_run.sh -i container-engine/cri-dockerd
   when: on_success
 
 molecule_containerd:
@@ -60,13 +60,6 @@ molecule_cri-o:
     - ./tests/scripts/molecule_run.sh -i container-engine/cri-o
   when: on_success
 
-molecule_cri-dockerd:
-  extends: .molecule
-  stage: deploy-part2
-  script:
-    - ./tests/scripts/molecule_run.sh -i container-engine/cri-dockerd
-  when: on_success
-
 # Stage 3 container engines don't get as much attention so allow them to fail
 molecule_kata:
   extends: .molecule

roles/container-engine/docker/molecule/default/converge.yml

----
-- name: Converge
-  hosts: all
-  become: true
-  roles:
-    - role: kubespray-defaults
-    - role: container-engine/docker

roles/container-engine/docker/molecule/default/molecule.yml

----
-driver:
-  name: vagrant
-  provider:
-    name: libvirt
-lint: |
-  set -e
-  yamllint -c ../../../.yamllint .
-platforms:
-  - name: ubuntu18
-    box: generic/ubuntu1804
-    cpus: 2
-    memory: 1024
-  - name: almalinux8
-    box: almalinux/8
-    cpus: 2
-    memory: 1024
-provisioner:
-  name: ansible
-  env:
-    ANSIBLE_ROLES_PATH: ../../../../
-  config_options:
-    defaults:
-      callbacks_enabled: profile_tasks
-      timeout: 120
-  lint:
-    name: ansible-lint
-    options:
-      c: ../../../.ansible-lint
-verifier:
-  name: testinfra
-  lint:
-    name: flake8

roles/container-engine/docker/molecule/default/prepare.yml

----
-- name: Prepare
-  hosts: all
-  gather_facts: False
-  roles:
-    - role: bootstrap-os

roles/container-engine/docker/molecule/default/tests/test_default.py

-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
-
-def test_docker_service(host):
-    docker = host.service("docker")
-    assert docker.is_running
-    assert docker.is_enabled
-
-
-def test_docker_run(host):
-    with host.sudo():
-        cmd = host.command("docker run quay.io/kubespray/hello-world:latest")
-    assert cmd.rc == 0
-    assert "Hello from Docker" in cmd.stdout

roles/kubernetes/node/templates/kubelet.env.v1beta1.j2

@@ -14,7 +14,6 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
 {# end kubeadm specific settings #}
 --container-runtime=remote \
 --container-runtime-endpoint=unix://{{ cri_socket }} \
-{% endif %}
 --runtime-cgroups={{ kubelet_runtime_cgroups }} \
 {% endset %}