Skip to content

Commit

Permalink
[CI] remove docker stand-alone molecule test
Browse files Browse the repository at this point in the history
  • Loading branch information
cristicalin authored and k8s-ci-robot committed Jun 15, 2022
1 parent 5dc8be9 commit 589823b
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 74 deletions.
9 changes: 1 addition & 8 deletions .gitlab-ci/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
7 changes: 0 additions & 7 deletions roles/container-engine/docker/molecule/default/converge.yml

This file was deleted.

33 changes: 0 additions & 33 deletions roles/container-engine/docker/molecule/default/molecule.yml

This file was deleted.

6 changes: 0 additions & 6 deletions roles/container-engine/docker/molecule/default/prepare.yml

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion roles/kubernetes/node/templates/kubelet.env.v1beta1.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down

0 comments on commit 589823b

Please sign in to comment.