Merge pull request #10 from ssbarnea/master

Reinstated Vagrant driver

Author: ssbarnea

.pre-commit-config.yaml

@@ -1,16 +1,10 @@
 ---
+default_language_version:
+  python: python3
+minimum_pre_commit_version: "1.14.0"
 repos:
-  - repo: https://github.com/PyCQA/doc8.git
-    rev: 0.8.1rc1
-    hooks:
-      - id: doc8
-  - repo: https://github.com/python/black.git
-    rev: 19.3b0
-    hooks:
-      - id: black
-        language_version: python3
-  - repo: https://github.com/pre-commit/pre-commit-hooks.git
-    rev: v2.2.3
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.5.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
@@ -19,21 +13,27 @@ repos:
       - id: check-executables-have-shebangs
       - id: check-merge-conflict
       - id: debug-statements
+      - id: check-yaml
+        files: .*\.(yaml|yml)$
+        # https://github.com/pre-commit/pre-commit-hooks/issues/273
+        args: ["--unsafe"]
+  - repo: https://github.com/PyCQA/doc8.git
+    rev: 0.8.1rc3
+    hooks:
+      - id: doc8
+  - repo: https://github.com/python/black.git
+    rev: 19.10b0
+    hooks:
+      - id: black
+        language_version: python3
   - repo: https://gitlab.com/pycqa/flake8.git
-    rev: 3.7.8
+    rev: 3.7.9
     hooks:
       - id: flake8
         additional_dependencies:
           - flake8-black
-  - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.16.0
-    hooks:
-      - id: yamllint
-        files: \.(yaml|yml)$
-        types: [file, yaml]
-        entry: yamllint --strict
   - repo: https://github.com/codespell-project/codespell.git
-    rev: v1.15.0
+    rev: v1.16.0
     hooks:
       - id: codespell
         name: codespell
@@ -44,3 +44,36 @@ repos:
         args: []
         require_serial: false
         additional_dependencies: []
+  - repo: https://github.com/PyCQA/flake8.git
+    rev: 3.7.9
+    hooks:
+      - id: flake8
+  - repo: https://github.com/adrienverge/yamllint.git
+    rev: v1.20.0
+    hooks:
+      - id: yamllint
+        files: \.(yaml|yml)$
+        types: [file, yaml]
+        entry: yamllint --strict -f parsable
+  - repo: https://github.com/openstack-dev/bashate.git
+    rev: 1.0.0
+    hooks:
+      - id: bashate
+        entry: bashate --error . --ignore=E006,E040
+        # Run bashate check for all bash scripts
+        # Ignores the following rules:
+        # E006: Line longer than 79 columns (as many scripts use jinja
+        #       templating, this is very difficult)
+        # E040: Syntax error determined using `bash -n` (as many scripts
+        #       use jinja templating, this will often fail and the syntax
+        #       error will be discovered in execution anyway)
+  - repo: https://github.com/ansible/ansible-lint.git
+    rev: v4.2.0
+    hooks:
+      - id: ansible-lint
+        always_run: true
+        pass_filenames: false
+        # do not add file filters here as ansible-lint does not give reliable
+        # results when called with individual files.
+        # https://github.com/ansible/ansible-lint/issues/611
+        entry: env ANSIBLE_LIBRARY=molecule_vagrant/modules ansible-lint --force-color -p -v

README.rst

@@ -6,18 +6,18 @@ Molecule Vagrant Plugin
    :target: https://badge.fury.io/py/molecule-vagrant
    :alt: PyPI Package
 
-.. image:: https://img.shields.io/travis/com/pycontribs/molecule-vagrant/master.svg?label=Linux%20builds%20%40%20Travis%20CI
-   :target: https://travis-ci.com/pycontribs/molecule-vagrant
+.. image:: https://zuul-ci.org/gated.svg
+   :target: https://dashboard.zuul.ansible.com/t/ansible/builds?project=ansible-community/molecule-vagrant
 
 .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
    :target: https://github.com/python/black
    :alt: Python Black Code Style
 
-.. image:: https://img.shields.io/badge/Code%20of%20Conduct-Ansible-silver.svg
+.. image:: https://img.shields.io/badge/Code%20of%20Conduct-silver.svg
    :target: https://docs.ansible.com/ansible/latest/community/code_of_conduct.html
    :alt: Ansible Code of Conduct
 
-.. image:: https://img.shields.io/badge/Mailing%20lists-Ansible-orange.svg
+.. image:: https://img.shields.io/badge/Mailing%20lists-silver.svg
    :target: https://docs.ansible.com/ansible/latest/community/communication.html#mailing-list-information
    :alt: Ansible mailing lists
 

bindep.txt

@@ -0,0 +1,33 @@
+# This is a cross-platform list tracking distribution packages needed by tests;
+# see https://docs.openstack.org/infra/bindep/ for additional information.
+
+build-dep [platform:dpkg]
+dnsmasq-base [platform:dpkg]
+ebtables [platform:dpkg]
+gcc [test platform:rpm]
+gcc-c++ [test platform:rpm]
+libselinux-python [platform:centos-7]
+libvirt [platform:rpm]
+libvirt-clients [platform:dpkg]
+libvirt-daemon [platform:dpkg]
+libvirt-daemon-kvm [platform:rpm]
+libvirt-daemon-system [platform:dpkg]
+libvirt-dev [platform:dpkg]
+libvirt-devel [platform:rpm]
+libxml2-dev [platform:dpkg]
+libxslt-dev [platform:dpkg]
+make [platform:centos-7]
+pkg-config [platform:dpkg]
+python3 [test platform:rpm !platform:centos-7]
+python3-devel [test platform:rpm !platform:centos-7]
+python3-libselinux [test platform:rpm !platform:centos-7]
+python3-libvirt [test platform:rpm !platform:centos-7 platform:dpkg]
+python3-netifaces [test !platform:centos-7 platform:rpm]
+python36 [test !platform:centos-7 !platform:fedora-28]
+qemu [platform:dpkg]
+qemu-kvm [platform:rpm]
+ruby-dev [platform:dpkg]
+ruby-devel [platform:rpm]
+ruby-libvirt [platform:dpkg]
+vagrant [platform:dpkg]
+zlib1g-dev [platform:dpkg]

molecule

@@ -0,0 +1 @@
+../molecule-vagrant/molecule_vagrant/test/scenarios/molecule

molecule_vagrant/__init__.py

@@ -0,0 +1,3 @@
+"""Plugin exports."""
+
+__name__ = __name__.split("_")[-1]

molecule_vagrant/cookiecutter/cookiecutter.json

@@ -0,0 +1,5 @@
+{
+    "molecule_directory": "molecule",
+    "role_name": "OVERRIDDEN",
+    "scenario_name": "OVERRIDDEN"
+}

molecule_vagrant/cookiecutter/scenario/driver/vagrant/cookiecutter.json

@@ -1,6 +1,6 @@
-*******
+*********************************
 Vagrant driver installation guide
-*******
+*********************************
 
 Requirements
 ============
@@ -20,4 +20,4 @@ widely recommended `'--user' flag`_ when invoking ``pip``.
 
 .. code-block:: bash
 
-    $ pip install 'molecule[vagrant]'
+    $ pip install 'molecule_vagrant'

molecule_vagrant/cookiecutter/scenario/driver/vagrant/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/prepare.yml

@@ -38,7 +38,7 @@ class Vagrant(Driver):
 
     .. important::
 
-        This driver is alpha quality software.  Do not perform any additonal
+        This driver is alpha quality software.  Do not perform any additional
         tasks inside the ``create`` playbook.  Molecule does not know about the
         Vagrant instances' configuration until the ``converge`` playbook is
         executed.
@@ -86,7 +86,7 @@ class Vagrant(Driver):
 
     .. code-block:: bash
 
-        $ pip install molecule[vagrant]
+        $ pip install molecule-vagrant
 
     Change the provider passed to Vagrant.
 
@@ -126,7 +126,7 @@ class Vagrant(Driver):
 
     def __init__(self, config=None):
         super(Vagrant, self).__init__(config)
-        self._name = 'vagrant'
+        self._name = "vagrant"
 
     @property
     def name(self):
@@ -139,20 +139,20 @@ def name(self, value):
     @property
     def testinfra_options(self):
         return {
-            'connection': 'ansible',
-            'ansible-inventory': self._config.provisioner.inventory_file,
+            "connection": "ansible",
+            "ansible-inventory": self._config.provisioner.inventory_file,
         }
 
     @property
     def login_cmd_template(self):
-        connection_options = ' '.join(self.ssh_connection_options)
+        connection_options = " ".join(self.ssh_connection_options)
 
         return (
-            'ssh {{address}} '
-            '-l {{user}} '
-            '-p {{port}} '
-            '-i {{identity_file}} '
-            '{}'
+            "ssh {{address}} "
+            "-l {{user}} "
+            "-p {{port}} "
+            "-i {{identity_file}} "
+            "{}"
         ).format(connection_options)
 
     @property
@@ -161,17 +161,17 @@ def default_safe_files(self):
             self.vagrantfile,
             self.vagrantfile_config,
             self.instance_config,
-            os.path.join(self._config.scenario.ephemeral_directory, '.vagrant'),
-            os.path.join(self._config.scenario.ephemeral_directory, 'vagrant-*.out'),
-            os.path.join(self._config.scenario.ephemeral_directory, 'vagrant-*.err'),
+            os.path.join(self._config.scenario.ephemeral_directory, ".vagrant"),
+            os.path.join(self._config.scenario.ephemeral_directory, "vagrant-*.out"),
+            os.path.join(self._config.scenario.ephemeral_directory, "vagrant-*.err"),
         ]
 
     @property
     def default_ssh_connection_options(self):
         return self._get_ssh_connection_options()
 
     def login_options(self, instance_name):
-        d = {'instance': instance_name}
+        d = {"instance": instance_name}
 
         return util.merge_dicts(d, self._get_instance_config(instance_name))
 
@@ -180,12 +180,12 @@ def ansible_connection_options(self, instance_name):
             d = self._get_instance_config(instance_name)
 
             return {
-                'ansible_user': d['user'],
-                'ansible_host': d['address'],
-                'ansible_port': d['port'],
-                'ansible_private_key_file': d['identity_file'],
-                'connection': 'ssh',
-                'ansible_ssh_common_args': ' '.join(self.ssh_connection_options),
+                "ansible_user": d["user"],
+                "ansible_host": d["address"],
+                "ansible_port": d["port"],
+                "ansible_private_key_file": d["identity_file"],
+                "connection": "ssh",
+                "ansible_ssh_common_args": " ".join(self.ssh_connection_options),
             }
         except StopIteration:
             return {}
@@ -196,17 +196,17 @@ def ansible_connection_options(self, instance_name):
 
     @property
     def vagrantfile(self):
-        return os.path.join(self._config.scenario.ephemeral_directory, 'Vagrantfile')
+        return os.path.join(self._config.scenario.ephemeral_directory, "Vagrantfile")
 
     @property
     def vagrantfile_config(self):
-        return os.path.join(self._config.scenario.ephemeral_directory, 'vagrant.yml')
+        return os.path.join(self._config.scenario.ephemeral_directory, "vagrant.yml")
 
     def _get_instance_config(self, instance_name):
         instance_config_dict = util.safe_load_file(self._config.driver.instance_config)
 
         return next(
-            item for item in instance_config_dict if item['instance'] == instance_name
+            item for item in instance_config_dict if item["instance"] == instance_name
         )
 
     def sanity_checks(self):
@@ -217,6 +217,7 @@ def template_dir(self):
         """ Return path to its own cookiecutterm templates. It is used by init
         command in order to figure out where to load the templates from.
         """
-        return os.path.join(
-            os.path.dirname(__file__), "cookiecutter/scenario/driver/vagrant"
-        )
+        return os.path.join(os.path.dirname(__file__), "cookiecutter")
+
+    def modules_dir(self):
+        return os.path.join(os.path.dirname(__file__), "modules")

molecule_vagrant/cookiecutter/scenario/driver/vagrant/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/INSTALL.rst molecule_vagrant/cookiecutter/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/INSTALL.rst

@@ -0,0 +1,62 @@
+---
+- name: Create
+  hosts: localhost
+  connection: local
+  gather_facts: false
+  no_log: "{{ molecule_no_log }}"
+  tasks:
+    - name: Create molecule instance(s)
+      vagrant:
+        instance_name: "{{ item.name }}"
+        instance_interfaces: "{{ item.interfaces | default(omit) }}"
+        instance_raw_config_args: "{{ item.instance_raw_config_args | default(omit) }}"
+
+        config_options: "{{ item.config_options | default(omit) }}"
+
+        platform_box: "{{ item.box | default('generic/alpine310') }}"
+        platform_box_version: "{{ item.box_version | default(omit) }}"
+        platform_box_url: "{{ item.box_url | default(omit) }}"
+
+        provider_name: "{{ molecule_yml.driver.provider.name }}"
+        provider_memory: "{{ item.memory | default(omit) }}"
+        provider_cpus: "{{ item.cpus | default(omit) }}"
+        provider_options: "{{ item.provider_options | default(omit) }}"
+        provider_raw_config_args: "{{ item.provider_raw_config_args | default(omit) }}"
+        provider_override_args: "{{ item.provider_override_args | default(omit) }}"
+
+        provision: "{{ item.provision | default(omit) }}"
+
+        state: up
+      register: server
+      with_items: "{{ molecule_yml.platforms }}"
+      loop_control:
+        label: "{{ item.name }}"
+      no_log: false
+
+    # NOTE(retr0h): Vagrant/VBox sucks and parallelizing instance creation
+    # causes issues.
+
+    # Mandatory configuration for Molecule to function.
+
+    - when: server.changed | bool
+      block:
+
+        - name: Populate instance config dict
+          set_fact:
+            instance_conf_dict: {
+              'instance': "{{ item.Host }}",
+              'address': "{{ item.HostName }}",
+              'user': "{{ item.User }}",
+              'port': "{{ item.Port }}",
+              'identity_file': "{{ item.IdentityFile }}", }
+          with_items: "{{ server.results }}"
+          register: instance_config_dict
+
+        - name: Convert instance config dict to a list
+          set_fact:
+            instance_conf: "{{ instance_config_dict.results | map(attribute='ansible_facts.instance_conf_dict') | list }}"
+
+        - name: Dump instance config
+          copy:
+            content: "{{ instance_conf | to_json | from_json | molecule_to_yaml | molecule_header }}"
+            dest: "{{ molecule_instance_config }}"

molecule_vagrant/cookiecutter/scenario/driver/vagrant/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/playbook.yml molecule_vagrant/cookiecutter/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/converge.yml

@@ -0,0 +1,37 @@
+---
+- name: Destroy
+  hosts: localhost
+  connection: local
+  gather_facts: false
+  no_log: "{{ molecule_no_log }}"
+  tasks:
+    - name: Destroy molecule instance(s)
+      vagrant:
+        instance_name: "{{ item.name }}"
+        platform_box: "{{ item.box | default(omit) }}"
+        provider_name: "{{ molecule_yml.driver.provider.name }}"
+        provider_options: "{{ item.provider_options | default(omit) }}"
+        provider_raw_config_args: "{{ item.provider_raw_config_args | default(omit) }}"
+        force_stop: "{{ item.force_stop | default(true) }}"
+
+        state: destroy
+      register: server
+      with_items: "{{ molecule_yml.platforms }}"
+      loop_control:
+        label: "{{ item.name }}"
+      no_log: false
+
+    # NOTE(retr0h): Vagrant/VBox sucks and parallelizing instance deletion
+    # causes issues.
+
+    # Mandatory configuration for Molecule to function.
+
+    - name: Populate instance config
+      set_fact:
+        instance_conf: {}
+
+    - name: Dump instance config  # noqa 503
+      copy:
+        content: "{{ instance_conf | to_json | from_json | molecule_to_yaml | molecule_header }}"
+        dest: "{{ molecule_instance_config }}"
+      when: server.changed | bool

molecule_vagrant/driver.py

@@ -0,0 +1,15 @@
+---
+- name: Prepare
+  hosts: all
+  gather_facts: false
+  tasks:
+    - name: Bootstrap python for Ansible
+      raw: |
+        command -v python3 python || (
+        command -v apk >/dev/null && sudo apk add --no-progress --update python3 ||
+        (test -e /usr/bin/dnf && sudo dnf install -y python3) ||
+        (test -e /usr/bin/apt && (apt -y update && apt install -y python-minimal)) ||
+        echo "Warning: Python not boostrapped due to unknown platform."
+        )
+      become: true
+      changed_when: false

molecule_vagrant/modules/__init__.py

@@ -25,33 +25,27 @@
 
 from molecule import logger
 from molecule.test.conftest import run_command, change_dir_to
-from molecule.test.functional.conftest import metadata_lint_update
 
 # import change_dir_to, temp_dir
 
 LOG = logger.get_logger(__name__)
 
 
-@pytest.mark.xfail(reason="need to fix template path")
+# @pytest.mark.xfail(reason="need to fix template path")
 def test_command_init_scenario(temp_dir):
     role_directory = os.path.join(temp_dir.strpath, "test-init")
-    options = {"role_name": "test-init"}
-    cmd = sh.molecule.bake("init", "role", **options)
+    options = {}
+    cmd = sh.molecule.bake("init", "role", "test-init", **options)
     run_command(cmd)
-    metadata_lint_update(role_directory)
 
     with change_dir_to(role_directory):
         molecule_directory = pytest.helpers.molecule_directory()
         scenario_directory = os.path.join(molecule_directory, "test-scenario")
-        options = {
-            "scenario_name": "test-scenario",
-            "role_name": "test-init",
-            "driver-name": "vagrant",
-        }
-        cmd = sh.molecule.bake("init", "scenario", **options)
+        options = {"role_name": "test-init", "driver-name": "vagrant"}
+        cmd = sh.molecule.bake("init", "scenario", "test-scenario", **options)
         run_command(cmd)
 
         assert os.path.isdir(scenario_directory)
 
-        cmd = sh.molecule.bake("test", "-s", "test-scenario")
+        cmd = sh.molecule.bake("--debug", "test", "-s", "test-scenario")
         run_command(cmd)

molecule_vagrant/modules/vagrant.py

@@ -0,0 +1,11 @@
+---
+- name: Converge
+  hosts: all
+  gather_facts: false
+  become: true
+  tasks:
+    - name: sample task  # noqa 305
+      shell:
+        cmd: uname
+        warn: false
+      changed_when: false

molecule_vagrant/playbooks/create.yml

@@ -0,0 +1,13 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: vagrant
+  provider:
+    name: virtualbox
+platforms:
+  - name: instance
+    box: generic/alpine310
+    provision: false
+provisioner:
+  name: ansible

molecule_vagrant/playbooks/destroy.yml

@@ -0,0 +1,44 @@
+---
+- name: Converge
+  hosts: all
+  gather_facts: false
+  become: true
+  tasks:
+    - name: sample task  # noqa 305
+      shell:
+        cmd: uname
+        warn: false
+      changed_when: false
+
+- name: Converge
+  hosts: bar
+  gather_facts: false
+  become: true
+  tasks:
+    - name: sample task  # noqa 305
+      shell:
+        cmd: uname
+        warn: false
+      changed_when: false
+
+- name: Converge
+  hosts: foo
+  gather_facts: false
+  become: true
+  tasks:
+    - name: sample task  # noqa 305
+      shell:
+        cmd: uname
+        warn: false
+      changed_when: false
+
+- name: Converge
+  hosts: baz
+  gather_facts: false
+  become: true
+  tasks:
+    - name: sample task  # noqa 305
+      shell:
+        cmd: uname
+        warn: false
+      changed_when: false

molecule_vagrant/playbooks/prepare.yml

@@ -5,10 +5,6 @@ driver:
   name: vagrant
   provider:
     name: virtualbox
-lint:
-  name: yamllint
-  options:
-    config-file: ../../../resources/.yamllint
 platforms:
   - name: instance-1
     box: debian/jessie64
@@ -45,18 +41,3 @@ provisioner:
   config_options:
     defaults:
       callback_whitelist: profile_roles,profile_tasks,timer
-  playbooks:
-    create: ../../../../../resources/playbooks/vagrant/create.yml
-    destroy: ../../../../../resources/playbooks/vagrant/destroy.yml
-  env:
-    ANSIBLE_ROLES_PATH: ../../../../../resources/roles/
-  lint:
-    name: ansible-lint
-scenario:
-  name: multi-node
-verifier:
-  name: testinfra
-  options:
-    sudo: true
-  lint:
-    name: flake8

molecule_vagrant/test/functional/.ansible-lint

@@ -1,5 +1,5 @@
 [pytest]
-addopts = -v -rxXs --doctest-modules --durations 10 --cov=molecule_vagrant --cov-report term-missing:skip-covered --cov-report xml
+addopts = -v -rxXs --doctest-modules --durations 10 --no-cov-on-fail --cov=molecule_vagrant --cov-report term-missing:skip-covered
 doctest_optionflags = ALLOW_UNICODE ELLIPSIS
 junit_suite_name = molecule_test_suite
 norecursedirs = dist doc build .tox .eggs test/scenarios test/resources

molecule_vagrant/test/functional/test_azure.py molecule_vagrant/test/functional/test_func.py

@@ -6,12 +6,12 @@ universal = 1
 
 [metadata]
 name = molecule-vagrant
-url = https://github.com/pycontribs/molecule-vagrant
+url = https://github.com/ansible-community/molecule-vagrant
 project_urls =
-    Bug Tracker = https://github.com/pycontribs/molecule-vagrant/issues
-    Release Management = https://github.com/pycontribs/molecule-vagrant/projects
-    CI: Travis = https://travis-ci.com/pycontribs/molecule-vagrant
-    Source Code = https://github.com/pycontribs/molecule-vagrant
+    Bug Tracker = https://github.com/ansible-community/molecule-vagrant/issues
+    Release Management = https://github.com/ansible-community/molecule-vagrant/releases
+    CI: Zuul = https://dashboard.zuul.ansible.com/t/ansible/builds?project=ansible-community/molecule-vagrant
+    Source Code = https://github.com/ansible-community/molecule-vagrant
 description = Vagrant Molecule Plugin :: run molecule tests using Vagrant
 long_description = file: README.rst
 long_description_content_type = text/x-rst
@@ -63,24 +63,27 @@ setup_requires =
 
 # These are required in actual runtime:
 install_requires =
-    ansible
-    molecule >= 3.0a3
+    ansible >= 2.9.5
+    molecule >= 3.0.2
     pyyaml >= 5.1, < 6
     python-vagrant
+    selinux
 
 [options.extras_require]
 test =
+    ansi2html  # soft-dependency of pytest-html
+    coverage>=4.4, < 5  # drop '<5' when we drop py27 as we cannot mix them
     flake8>=3.6.0, < 4
 
     mock>=3.0.5, < 4
     pytest>=4.6.3, < 5
     pytest-cov>=2.7.1, < 3
     pytest-helpers-namespace>=2019.1.8, < 2020
+    pytest-html
     pytest-mock>=1.10.4, < 2
     pytest-verbose-parametrize>=1.7.0, < 2
     pytest-xdist>=1.29.0, < 2
     pytest-dependency
-    shade>=1.31.0, < 2
 
 [options.entry_points]
 molecule.driver =

molecule_vagrant/test/scenarios/driver/vagrant/molecule/default/molecule.yml

@@ -0,0 +1,3 @@
+Vagrant.configure("2") do |config|
+  config.vm.box = "generic/alpine310"
+end

molecule_vagrant/test/scenarios/driver/vagrant/molecule/default/playbook.yml

@@ -0,0 +1,57 @@
+#!/bin/bash
+set -euxo pipefail
+# Used by Zuul CI to perform extra bootstrapping
+
+# Platforms coverage:
+# Fedora 30 : has vagrant-libvirt no compilation needed
+# CentOS 7  : install upstream vagrant rpm and compiles plugin (broken runtime)
+# CentOS 8  : install upstream vagrant rpm and compiles plugin (broken runtime)
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+# Bumping system tox because version from CentOS 7 is too old
+# We are not using pip --user due to few bugs in tox role which does not allow
+# us to override how is called. Once these are addressed we will switch back
+# non-sudo
+command -v python3 python
+
+PYTHON=$(command -v python3 python|head -n1)
+PKG_CMD=$(command -v dnf yum|head -n1)
+
+sudo $PYTHON -m pip install -U tox "zipp<0.6.0;python_version=='2.7'"
+
+# === LIBVIRT SETUP ===
+# https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1588004
+sudo rm -f /etc/systemd/libvirtd.service /etc/systemd/system/multi-user.target.wants/libvirt-bin.service || true
+sudo systemctl enable --now libvirtd
+sudo usermod --append --groups libvirt "$(whoami)"
+
+# === VAGRANT SETUP ===
+# Install Vagrant using their questionable practices, see locked ticket:
+# https://github.com/hashicorp/vagrant/issues/11070
+
+which vagrant || \
+    sudo $PKG_CMD install -y vagrant-libvirt || {
+        sudo $PKG_CMD install -y https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_x86_64.rpm
+    }
+
+vagrant plugin list | grep vagrant-libvirt || {
+    CONFIGURE_ARGS="with-libvirt-include=/usr/include/libvirt with-libvirt-lib=/usr/lib64" vagrant plugin install vagrant-libvirt
+}
+
+rpm -qa | grep libselinux
+
+vagrant version
+vagrant global-status
+
+vagrant plugin list | tee >(grep -q "No plugins installed." && {
+    echo "FATAL: Vagrant is not usable without any provider plugins."
+    exit 1
+})
+
+# Used to test that Vagrant is usable and also to pre-download the image
+# we will use during testing.
+cd $DIR
+
+vagrant up --no-provision
+vagrant destroy -f

molecule_vagrant/test/scenarios/driver/vagrant/molecule/default/tests/test_default.py

@@ -1,7 +1,7 @@
 # For more information about tox, see https://tox.readthedocs.io/en/latest/
 [tox]
-minversion = 3.4.0
-envlist = lint,dist,py27,py35,py36,py37,py38,devel,distros
+minversion = 3.9.0
+envlist = lint,packaging,py27,py35,py36,py37,py38,devel,distros
 skipsdist = True
 skip_missing_interpreters = True
 isolated_build = True
@@ -30,10 +30,14 @@ setenv =
     # This should pass these args to molecule, no effect here as this is the default
     # but it validates that it accepts extra params.
     MOLECULE_OPTS=--destroy always
+    MOLECULE_NO_LOG="false"
+    _EXTRAS=-l --html={envlogdir}/reports.html --self-contained-html
+    PYTEST_ADDOPTS={env:_EXTRAS} {env:PYTEST_ADDOPTS:}
 passenv =
     CI
     CURL_CA_BUNDLE
     DOCKER_*
+    HOME
     PYTEST_OPTIONS
     REQUESTS_CA_BUNDLE
     SSH_AUTH_SOCK
@@ -42,21 +46,22 @@ passenv =
     TRAVIS
     TRAVIS_*
     TWINE_*
+    VAGRANT_HOME
 whitelist_externals =
     bash
     twine
     pytest
     pre-commit
 
-[testenv:dist]
+[testenv:packaging]
 usedevelop = false
 skip_install = true
 deps =
     collective.checkdocs >= 0.2
     pep517 >= 0.5.0
     twine >= 2.0.0
 commands =
-    bash -c "rm -rf {toxinidir}/dist/ && mkdir -p {toxinidir}/dist/"
+    bash -c "rm -rf {toxinidir}/dist/ {toxinidir}/build/ && mkdir -p {toxinidir}/dist/"
     python -m pep517.build \
       --source \
       --binary \
@@ -71,7 +76,7 @@ commands =
     {[testenv]commands}
 deps =
     git+https://github.com/ansible/ansible.git#egg=ansible
-    git+https://github.com/ansible/molecule#egg=molecule
+    git+https://github.com/ansible-community/molecule#egg=molecule
 
 [testenv:lint]
 description = Performs linting, style checks
@@ -85,7 +90,7 @@ commands =
 description = Builds the packages and uploads them to https://pypi.org
 envdir={toxworkdir}/dist
 deps=
-    {[testenv:dist]deps}
+    {[testenv:packaging]deps}
 commands =
-    {[testenv:dist]commands}
+    {[testenv:packaging]commands}
     twine upload --verbose dist/*

molecule_vagrant/test/scenarios/driver/vagrant/molecule/multi-node/playbook.yml

@@ -0,0 +1,47 @@
+---
+# zuul.d/layout.yaml
+- job:
+    name: molecule-tox-devel-centos-8
+    parent: molecule-tox-py36
+    vars:
+      tox_envlist: devel
+    attempts: 1
+
+- job:
+    name: molecule-tox-py27-centos-7
+    parent: molecule-tox-py27
+    attempts: 1
+
+- job:
+    name: molecule-tox-py36-centos-8
+    parent: molecule-tox-py36
+    attempts: 1
+
+- job:
+    name: molecule-tox-py37-fedora-30
+    parent: molecule-tox-py37
+    attempts: 1
+
+- project:
+    templates:
+      - publish-to-pypi
+    check:
+      jobs: &defaults
+        - molecule-tox-linters:
+            vars:
+              tox_envlist: lint
+        - molecule-tox-packaging:
+            vars:
+              tox_envlist: packaging
+        - molecule-tox-py27-centos-7:
+            # broken vagrant-libvirt install
+            voting: false
+        - molecule-tox-py36-centos-8:
+            # broken vagrant-libvirt install
+            voting: false
+        - molecule-tox-py37-fedora-30
+        - molecule-tox-devel-centos-8:
+            # broken vagrant-libvirt install
+            voting: false
+    gate:
+      jobs: *defaults