diff --git a/.zuul.yaml b/.zuul.yaml index 857e080..3ba2321 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -66,7 +66,6 @@ - ansible-role-nodepool-src-fedora-latest - ansible-role-nodepool-src-ubuntu-bionic - tox-linters - - windmill-tox-molecule gate: jobs: - ansible-role-nodepool-docker @@ -75,4 +74,3 @@ - ansible-role-nodepool-src-fedora-latest - ansible-role-nodepool-src-ubuntu-bionic - tox-linters - - windmill-tox-molecule diff --git a/molecule/default/Dockerfile.j2 b/molecule/default/Dockerfile.j2 deleted file mode 100644 index 0a084c6..0000000 --- a/molecule/default/Dockerfile.j2 +++ /dev/null @@ -1,9 +0,0 @@ -# Molecule managed - -{% if item.registry is defined %} -FROM {{ item.registry.url }}/{{ item.image }} -{% else %} -FROM {{ item.image }} -{% endif %} - -RUN apt-get update && apt-get install -y python sudo bash ca-certificates python-pip python3-pip && apt-get clean; diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml deleted file mode 100644 index 4eda9ea..0000000 --- a/molecule/default/molecule.yml +++ /dev/null @@ -1,34 +0,0 @@ ---- -dependency: - name: galaxy -driver: - name: docker -lint: - name: yamllint -platforms: - - name: ubuntu-bionic - image: ubuntu:bionic -provisioner: - name: ansible - config_options: - ssh_connection: - pipelining: true - inventory: - group_vars: - all: - nodepool_service_nodepool_builder_manage: false - nodepool_service_nodepool_launcher_manage: false - lint: - name: ansible-lint - log: true - playbooks: - converge: ../../tests/playbooks/run.yaml -scenario: - name: default -verifier: - name: testinfra - directory: ../tests - options: - verbose: true - lint: - name: flake8 diff --git a/tox.ini b/tox.ini index 9c7d57d..1567c8c 100644 --- a/tox.ini +++ b/tox.ini @@ -34,10 +34,3 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build [testenv:linters] commands = yamllint -s . - -[testenv:molecule] -sitepackages = True -setenv = - ANSIBLE_CALLBACK_PLUGINS = {envsitepackagesdir}/ara/plugins/callbacks -commands = - molecule test