From 3af9540273c48e8150ed8aad3b7f594878269d7a Mon Sep 17 00:00:00 2001 From: Larry Smith Jr Date: Fri, 21 Feb 2020 14:41:05 -0500 Subject: [PATCH 1/5] Updated files, etc. after new structure --- .github/workflows/default.yml | 15 +++++++++++---- .gitlab-ci.yml | 14 +++++++++++--- .travis.yml | 14 +++++++++++--- README.md | 4 ++-- requirements.txt | 8 +++++++- 5 files changed, 42 insertions(+), 13 deletions(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 5cdc1a1..aac8e58 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -1,7 +1,6 @@ --- name: Molecule Test -on: - - push +on: push jobs: build: runs-on: ubuntu-latest @@ -22,8 +21,16 @@ jobs: run: | sudo apt install docker python -m pip install --upgrade pip - pip3 install ansible molecule docker + pip3 install -r requirements.txt ansible --version + molecule --version - name: Test with molecule run: | - molecule test + molecule test --scenario-name centos7 + # molecule test --scenario-name centos8 + # molecule test --scenario-name debian8 + molecule test --scenario-name debian9 + molecule test --scenario-name debian10 + molecule test --scenario-name fedora + molecule test --scenario-name ubuntu1604 + molecule test --scenario-name ubuntu1804 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3680bd8..05a7d9f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,10 +11,18 @@ before_script: musl-dev libffi-dev openssl-dev openssh - docker info - python3 --version + - pip3 install -r requirements.txt + - ansible --version + - molecule --version molecule: stage: test script: - - pip3 install ansible molecule docker - - ansible --version - - molecule test + - molecule test --scenario-name centos7 + # - molecule test --scenario-name centos8 + # - molecule test --scenario-name debian8 + - molecule test --scenario-name debian9 + - molecule test --scenario-name debian10 + - molecule test --scenario-name fedora + - molecule test --scenario-name ubuntu1604 + - molecule test --scenario-name ubuntu1804 diff --git a/.travis.yml b/.travis.yml index 02e63bf..0245833 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,17 @@ services: before_install: - sudo apt-get -qq update install: - - pip3 install ansible molecule docker -script: + - pip3 install -r requirements.txt - ansible --version - - molecule test + - molecule --version +script: + - molecule test --scenario-name centos7 + # - molecule test --scenario-name centos8 + # - molecule test --scenario-name debian8 + - molecule test --scenario-name debian9 + - molecule test --scenario-name debian10 + - molecule test --scenario-name fedora + - molecule test --scenario-name ubuntu1604 + - molecule test --scenario-name ubuntu1804 notifications: webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/README.md b/README.md index f33febd..8174884 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,6 @@ Ansible role to install/configure Guacamole [![Build Status](https://travis-ci.org/mrlesmithjr/ansible-guacamole.svg?branch=master)](https://travis-ci.org/mrlesmithjr/ansible-guacamole) - - ## Requirements For any required Ansible roles, review: @@ -40,3 +38,5 @@ Larry Smith Jr. - [@mrlesmithjr](https://twitter.com/mrlesmithjr) - [mrlesmithjr@gmail.com](mailto:mrlesmithjr@gmail.com) - [http://everythingshouldbevirtual.com](http://everythingshouldbevirtual.com) + +> NOTE: Repo has been created/updated using [https://github.com/mrlesmithjr/cookiecutter-ansible-role](https://github.com/mrlesmithjr/cookiecutter-ansible-role) as a template. diff --git a/requirements.txt b/requirements.txt index e8f8aaf..79c89f1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,7 @@ -# Python requirements for executing \ No newline at end of file +# Python requirements for executing +ansible +ansible-lint +docker +flake8 +molecule +testinfra \ No newline at end of file From 1ea8bfcbe964337fc9d6158bab1f08762b9f2a71 Mon Sep 17 00:00:00 2001 From: Larry Smith Jr Date: Fri, 21 Feb 2020 14:41:15 -0500 Subject: [PATCH 2/5] Changed Molecule scenarios, tests, etc. --- molecule/{default => centos7}/INSTALL.rst | 0 molecule/centos7/molecule.yml | 28 +++++++ molecule/centos7/verify.yml | 9 +++ molecule/{vagrant => centos8}/INSTALL.rst | 7 +- molecule/centos8/molecule.yml | 28 +++++++ molecule/centos8/verify.yml | 9 +++ molecule/debian10/INSTALL.rst | 22 ++++++ molecule/debian10/molecule.yml | 28 +++++++ molecule/debian10/verify.yml | 9 +++ molecule/debian8/INSTALL.rst | 22 ++++++ molecule/debian8/molecule.yml | 28 +++++++ molecule/debian8/verify.yml | 9 +++ molecule/debian9/INSTALL.rst | 22 ++++++ molecule/debian9/molecule.yml | 28 +++++++ molecule/debian9/verify.yml | 9 +++ molecule/default/Dockerfile.j2 | 22 ------ molecule/default/molecule.yml | 93 ----------------------- molecule/default/requirements.yml | 1 - molecule/fedora/INSTALL.rst | 22 ++++++ molecule/fedora/molecule.yml | 28 +++++++ molecule/fedora/verify.yml | 9 +++ molecule/shared/converge.yml | 7 ++ molecule/shared/playbook.yml | 10 --- molecule/shared/tests/test_default.py | 15 ---- molecule/shared/verify.yml | 9 +++ molecule/ubuntu1604/INSTALL.rst | 22 ++++++ molecule/ubuntu1604/molecule.yml | 28 +++++++ molecule/ubuntu1604/verify.yml | 9 +++ molecule/ubuntu1804/INSTALL.rst | 22 ++++++ molecule/ubuntu1804/molecule.yml | 28 +++++++ molecule/ubuntu1804/verify.yml | 9 +++ molecule/vagrant/molecule.yml | 34 --------- molecule/vagrant/prepare.yml | 9 --- molecule/vagrant/requirements.yml | 1 - 34 files changed, 447 insertions(+), 189 deletions(-) rename molecule/{default => centos7}/INSTALL.rst (100%) create mode 100644 molecule/centos7/molecule.yml create mode 100644 molecule/centos7/verify.yml rename molecule/{vagrant => centos8}/INSTALL.rst (74%) create mode 100644 molecule/centos8/molecule.yml create mode 100644 molecule/centos8/verify.yml create mode 100644 molecule/debian10/INSTALL.rst create mode 100644 molecule/debian10/molecule.yml create mode 100644 molecule/debian10/verify.yml create mode 100644 molecule/debian8/INSTALL.rst create mode 100644 molecule/debian8/molecule.yml create mode 100644 molecule/debian8/verify.yml create mode 100644 molecule/debian9/INSTALL.rst create mode 100644 molecule/debian9/molecule.yml create mode 100644 molecule/debian9/verify.yml delete mode 100644 molecule/default/Dockerfile.j2 delete mode 100644 molecule/default/molecule.yml delete mode 120000 molecule/default/requirements.yml create mode 100644 molecule/fedora/INSTALL.rst create mode 100644 molecule/fedora/molecule.yml create mode 100644 molecule/fedora/verify.yml create mode 100644 molecule/shared/converge.yml delete mode 100644 molecule/shared/playbook.yml delete mode 100644 molecule/shared/tests/test_default.py create mode 100644 molecule/shared/verify.yml create mode 100644 molecule/ubuntu1604/INSTALL.rst create mode 100644 molecule/ubuntu1604/molecule.yml create mode 100644 molecule/ubuntu1604/verify.yml create mode 100644 molecule/ubuntu1804/INSTALL.rst create mode 100644 molecule/ubuntu1804/molecule.yml create mode 100644 molecule/ubuntu1804/verify.yml delete mode 100644 molecule/vagrant/molecule.yml delete mode 100644 molecule/vagrant/prepare.yml delete mode 120000 molecule/vagrant/requirements.yml diff --git a/molecule/default/INSTALL.rst b/molecule/centos7/INSTALL.rst similarity index 100% rename from molecule/default/INSTALL.rst rename to molecule/centos7/INSTALL.rst diff --git a/molecule/centos7/molecule.yml b/molecule/centos7/molecule.yml new file mode 100644 index 0000000..ea2f842 --- /dev/null +++ b/molecule/centos7/molecule.yml @@ -0,0 +1,28 @@ +--- +dependency: + name: galaxy + enabled: false + options: + role-file: requirements.yml +driver: + name: docker +lint: | + yamllint . + ansible-lint + flake8 +platforms: + - name: centos7 + image: jrei/systemd-centos:7 + privileged: true + command: /usr/sbin/init + tmpfs: + - /run + - /tmp + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:ro +provisioner: + name: ansible + playbooks: + converge: ../shared/converge.yml +verifier: + name: ansible diff --git a/molecule/centos7/verify.yml b/molecule/centos7/verify.yml new file mode 100644 index 0000000..a82dd6f --- /dev/null +++ b/molecule/centos7/verify.yml @@ -0,0 +1,9 @@ +--- +# This is an example playbook to execute Ansible tests. + +- name: Verify + hosts: all + tasks: + - name: Example assertion + assert: + that: true diff --git a/molecule/vagrant/INSTALL.rst b/molecule/centos8/INSTALL.rst similarity index 74% rename from molecule/vagrant/INSTALL.rst rename to molecule/centos8/INSTALL.rst index 4f44b67..6a44bde 100644 --- a/molecule/vagrant/INSTALL.rst +++ b/molecule/centos8/INSTALL.rst @@ -1,12 +1,11 @@ ******* -Vagrant driver installation guide +Docker driver installation guide ******* Requirements ============ -* Vagrant -* Virtualbox, Parallels, VMware Fusion, VMware Workstation or VMware Desktop +* Docker Engine Install ======= @@ -20,4 +19,4 @@ widely recommended `'--user' flag`_ when invoking ``pip``. .. code-block:: bash - $ pip install 'molecule[vagrant]' + $ pip install 'molecule[docker]' diff --git a/molecule/centos8/molecule.yml b/molecule/centos8/molecule.yml new file mode 100644 index 0000000..7f690ad --- /dev/null +++ b/molecule/centos8/molecule.yml @@ -0,0 +1,28 @@ +--- +dependency: + name: galaxy + enabled: false + options: + role-file: requirements.yml +driver: + name: docker +lint: | + yamllint . + ansible-lint + flake8 +platforms: + - name: centos8 + image: jrei/systemd-centos:8 + privileged: true + command: /usr/sbin/init + tmpfs: + - /run + - /tmp + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:ro +provisioner: + name: ansible + playbooks: + converge: ../shared/converge.yml +verifier: + name: ansible diff --git a/molecule/centos8/verify.yml b/molecule/centos8/verify.yml new file mode 100644 index 0000000..a82dd6f --- /dev/null +++ b/molecule/centos8/verify.yml @@ -0,0 +1,9 @@ +--- +# This is an example playbook to execute Ansible tests. + +- name: Verify + hosts: all + tasks: + - name: Example assertion + assert: + that: true diff --git a/molecule/debian10/INSTALL.rst b/molecule/debian10/INSTALL.rst new file mode 100644 index 0000000..6a44bde --- /dev/null +++ b/molecule/debian10/INSTALL.rst @@ -0,0 +1,22 @@ +******* +Docker driver installation guide +******* + +Requirements +============ + +* Docker Engine + +Install +======= + +Please refer to the `Virtual environment`_ documentation for installation best +practices. If not using a virtual environment, please consider passing the +widely recommended `'--user' flag`_ when invoking ``pip``. + +.. _Virtual environment: https://virtualenv.pypa.io/en/latest/ +.. _'--user' flag: https://packaging.python.org/tutorials/installing-packages/#installing-to-the-user-site + +.. code-block:: bash + + $ pip install 'molecule[docker]' diff --git a/molecule/debian10/molecule.yml b/molecule/debian10/molecule.yml new file mode 100644 index 0000000..95d3e44 --- /dev/null +++ b/molecule/debian10/molecule.yml @@ -0,0 +1,28 @@ +--- +dependency: + name: galaxy + enabled: false + options: + role-file: requirements.yml +driver: + name: docker +lint: | + yamllint . + ansible-lint + flake8 +platforms: + - name: debian10 + image: jrei/systemd-debian:10 + privileged: true + command: /lib/systemd/systemd + tmpfs: + - /run + - /tmp + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:ro +provisioner: + name: ansible + playbooks: + converge: ../shared/converge.yml +verifier: + name: ansible diff --git a/molecule/debian10/verify.yml b/molecule/debian10/verify.yml new file mode 100644 index 0000000..a82dd6f --- /dev/null +++ b/molecule/debian10/verify.yml @@ -0,0 +1,9 @@ +--- +# This is an example playbook to execute Ansible tests. + +- name: Verify + hosts: all + tasks: + - name: Example assertion + assert: + that: true diff --git a/molecule/debian8/INSTALL.rst b/molecule/debian8/INSTALL.rst new file mode 100644 index 0000000..6a44bde --- /dev/null +++ b/molecule/debian8/INSTALL.rst @@ -0,0 +1,22 @@ +******* +Docker driver installation guide +******* + +Requirements +============ + +* Docker Engine + +Install +======= + +Please refer to the `Virtual environment`_ documentation for installation best +practices. If not using a virtual environment, please consider passing the +widely recommended `'--user' flag`_ when invoking ``pip``. + +.. _Virtual environment: https://virtualenv.pypa.io/en/latest/ +.. _'--user' flag: https://packaging.python.org/tutorials/installing-packages/#installing-to-the-user-site + +.. code-block:: bash + + $ pip install 'molecule[docker]' diff --git a/molecule/debian8/molecule.yml b/molecule/debian8/molecule.yml new file mode 100644 index 0000000..33a74e7 --- /dev/null +++ b/molecule/debian8/molecule.yml @@ -0,0 +1,28 @@ +--- +dependency: + name: galaxy + enabled: false + options: + role-file: requirements.yml +driver: + name: docker +lint: | + yamllint . + ansible-lint + flake8 +platforms: + - name: debian8 + image: jrei/systemd-debian:8 + privileged: true + command: /lib/systemd/systemd + tmpfs: + - /run + - /tmp + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:ro +provisioner: + name: ansible + playbooks: + converge: ../shared/converge.yml +verifier: + name: ansible diff --git a/molecule/debian8/verify.yml b/molecule/debian8/verify.yml new file mode 100644 index 0000000..a82dd6f --- /dev/null +++ b/molecule/debian8/verify.yml @@ -0,0 +1,9 @@ +--- +# This is an example playbook to execute Ansible tests. + +- name: Verify + hosts: all + tasks: + - name: Example assertion + assert: + that: true diff --git a/molecule/debian9/INSTALL.rst b/molecule/debian9/INSTALL.rst new file mode 100644 index 0000000..6a44bde --- /dev/null +++ b/molecule/debian9/INSTALL.rst @@ -0,0 +1,22 @@ +******* +Docker driver installation guide +******* + +Requirements +============ + +* Docker Engine + +Install +======= + +Please refer to the `Virtual environment`_ documentation for installation best +practices. If not using a virtual environment, please consider passing the +widely recommended `'--user' flag`_ when invoking ``pip``. + +.. _Virtual environment: https://virtualenv.pypa.io/en/latest/ +.. _'--user' flag: https://packaging.python.org/tutorials/installing-packages/#installing-to-the-user-site + +.. code-block:: bash + + $ pip install 'molecule[docker]' diff --git a/molecule/debian9/molecule.yml b/molecule/debian9/molecule.yml new file mode 100644 index 0000000..95a063d --- /dev/null +++ b/molecule/debian9/molecule.yml @@ -0,0 +1,28 @@ +--- +dependency: + name: galaxy + enabled: false + options: + role-file: requirements.yml +driver: + name: docker +lint: | + yamllint . + ansible-lint + flake8 +platforms: + - name: debian9 + image: jrei/systemd-debian:9 + privileged: true + command: /lib/systemd/systemd + tmpfs: + - /run + - /tmp + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:ro +provisioner: + name: ansible + playbooks: + converge: ../shared/converge.yml +verifier: + name: ansible diff --git a/molecule/debian9/verify.yml b/molecule/debian9/verify.yml new file mode 100644 index 0000000..a82dd6f --- /dev/null +++ b/molecule/debian9/verify.yml @@ -0,0 +1,9 @@ +--- +# This is an example playbook to execute Ansible tests. + +- name: Verify + hosts: all + tasks: + - name: Example assertion + assert: + that: true diff --git a/molecule/default/Dockerfile.j2 b/molecule/default/Dockerfile.j2 deleted file mode 100644 index 0de39e6..0000000 --- a/molecule/default/Dockerfile.j2 +++ /dev/null @@ -1,22 +0,0 @@ -# Molecule managed - -{% if item.registry is defined %} -FROM {{ item.registry.url }}/{{ item.image }} -{% else %} -FROM {{ item.image }} -{% endif %} - -{% if item.env is defined %} -{% for var, value in item.env.items() %} -{% if value %} -ENV {{ var }} {{ value }} -{% endif %} -{% endfor %} -{% endif %} - -RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates iproute2 && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash iproute && dnf clean all; \ - elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash iproute && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ - elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml iproute2 && zypper clean -a; \ - elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \ - elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates iproute2 && xbps-remove -O; fi diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml deleted file mode 100644 index 6b2ea58..0000000 --- a/molecule/default/molecule.yml +++ /dev/null @@ -1,93 +0,0 @@ ---- -dependency: - name: galaxy -driver: - name: docker -lint: - name: yamllint -platforms: - - name: centos7 - image: jrei/systemd-centos:7 - privileged: true - command: /usr/sbin/init - tmpfs: - - /run - - /tmp - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro - # - name: centos8 - # image: jrei/systemd-centos:8 - # privileged: true - # command: /usr/sbin/init - # tmpfs: - # - /run - # - /tmp - # volumes: - # - /sys/fs/cgroup:/sys/fs/cgroup:ro - # - name: debian8 - # image: jrei/systemd-debian:8 - # privileged: true - # command: /lib/systemd/systemd - # tmpfs: - # - /run - # - /tmp - # volumes: - # - /sys/fs/cgroup:/sys/fs/cgroup:ro - - name: debian9 - image: jrei/systemd-debian:9 - privileged: true - command: /lib/systemd/systemd - tmpfs: - - /run - - /tmp - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro - # - name: debian10 - # image: jrei/systemd-debian:10 - # privileged: true - # command: /lib/systemd/systemd - # tmpfs: - # - /run - # - /tmp - # volumes: - # - /sys/fs/cgroup:/sys/fs/cgroup:ro - # - name: fedora - # image: jrei/systemd-fedora - # privileged: true - # command: /usr/sbin/init - # tmpfs: - # - /run - # - /tmp - # volumes: - # - /sys/fs/cgroup:/sys/fs/cgroup:ro - - name: ubuntu1604 - image: jrei/systemd-ubuntu:16.04 - privileged: true - command: /lib/systemd/systemd - tmpfs: - - /run - - /tmp - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro - - name: ubuntu1804 - image: jrei/systemd-ubuntu:18.04 - privileged: true - command: /lib/systemd/systemd - tmpfs: - - /run - - /tmp - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro -provisioner: - name: ansible - lint: - name: ansible-lint - playbooks: - converge: ../shared/playbook.yml -verifier: - name: testinfra - directory: ../shared/tests - lint: - name: flake8 - additional_files_or_dirs: - - ../shared/* diff --git a/molecule/default/requirements.yml b/molecule/default/requirements.yml deleted file mode 120000 index 9a73643..0000000 --- a/molecule/default/requirements.yml +++ /dev/null @@ -1 +0,0 @@ -../../requirements.yml \ No newline at end of file diff --git a/molecule/fedora/INSTALL.rst b/molecule/fedora/INSTALL.rst new file mode 100644 index 0000000..6a44bde --- /dev/null +++ b/molecule/fedora/INSTALL.rst @@ -0,0 +1,22 @@ +******* +Docker driver installation guide +******* + +Requirements +============ + +* Docker Engine + +Install +======= + +Please refer to the `Virtual environment`_ documentation for installation best +practices. If not using a virtual environment, please consider passing the +widely recommended `'--user' flag`_ when invoking ``pip``. + +.. _Virtual environment: https://virtualenv.pypa.io/en/latest/ +.. _'--user' flag: https://packaging.python.org/tutorials/installing-packages/#installing-to-the-user-site + +.. code-block:: bash + + $ pip install 'molecule[docker]' diff --git a/molecule/fedora/molecule.yml b/molecule/fedora/molecule.yml new file mode 100644 index 0000000..c0320ef --- /dev/null +++ b/molecule/fedora/molecule.yml @@ -0,0 +1,28 @@ +--- +dependency: + name: galaxy + enabled: false + options: + role-file: requirements.yml +driver: + name: docker +lint: | + yamllint . + ansible-lint + flake8 +platforms: + - name: fedora + image: jrei/systemd-fedora + privileged: true + command: /usr/sbin/init + tmpfs: + - /run + - /tmp + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:ro +provisioner: + name: ansible + playbooks: + converge: ../shared/converge.yml +verifier: + name: ansible diff --git a/molecule/fedora/verify.yml b/molecule/fedora/verify.yml new file mode 100644 index 0000000..a82dd6f --- /dev/null +++ b/molecule/fedora/verify.yml @@ -0,0 +1,9 @@ +--- +# This is an example playbook to execute Ansible tests. + +- name: Verify + hosts: all + tasks: + - name: Example assertion + assert: + that: true diff --git a/molecule/shared/converge.yml b/molecule/shared/converge.yml new file mode 100644 index 0000000..84543c2 --- /dev/null +++ b/molecule/shared/converge.yml @@ -0,0 +1,7 @@ +--- +- name: Converge + hosts: all + tasks: + - name: "Include ansible-guacamole" + include_role: + name: "ansible-guacamole" diff --git a/molecule/shared/playbook.yml b/molecule/shared/playbook.yml deleted file mode 100644 index 807b10c..0000000 --- a/molecule/shared/playbook.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- name: Converge - hosts: all - vars: - guacamole_mysql_auth: false - guacamole_version: 1.1.0 - roles: - - role: ansible-mysql - when: guacamole_mysql_auth|bool - - role: ansible-guacamole diff --git a/molecule/shared/tests/test_default.py b/molecule/shared/tests/test_default.py deleted file mode 100644 index 9e0e189..0000000 --- a/molecule/shared/tests/test_default.py +++ /dev/null @@ -1,15 +0,0 @@ -import os - -import testinfra.utils.ansible_runner - -testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( - os.environ['MOLECULE_INVENTORY_FILE'] -).get_hosts('all') - - -def test_hosts_file(host): - f = host.file('/etc/hosts') - - assert f.exists - assert f.user == 'root' - assert f.group == 'root' diff --git a/molecule/shared/verify.yml b/molecule/shared/verify.yml new file mode 100644 index 0000000..a82dd6f --- /dev/null +++ b/molecule/shared/verify.yml @@ -0,0 +1,9 @@ +--- +# This is an example playbook to execute Ansible tests. + +- name: Verify + hosts: all + tasks: + - name: Example assertion + assert: + that: true diff --git a/molecule/ubuntu1604/INSTALL.rst b/molecule/ubuntu1604/INSTALL.rst new file mode 100644 index 0000000..6a44bde --- /dev/null +++ b/molecule/ubuntu1604/INSTALL.rst @@ -0,0 +1,22 @@ +******* +Docker driver installation guide +******* + +Requirements +============ + +* Docker Engine + +Install +======= + +Please refer to the `Virtual environment`_ documentation for installation best +practices. If not using a virtual environment, please consider passing the +widely recommended `'--user' flag`_ when invoking ``pip``. + +.. _Virtual environment: https://virtualenv.pypa.io/en/latest/ +.. _'--user' flag: https://packaging.python.org/tutorials/installing-packages/#installing-to-the-user-site + +.. code-block:: bash + + $ pip install 'molecule[docker]' diff --git a/molecule/ubuntu1604/molecule.yml b/molecule/ubuntu1604/molecule.yml new file mode 100644 index 0000000..88c928a --- /dev/null +++ b/molecule/ubuntu1604/molecule.yml @@ -0,0 +1,28 @@ +--- +dependency: + name: galaxy + enabled: false + options: + role-file: requirements.yml +driver: + name: docker +lint: | + yamllint . + ansible-lint + flake8 +platforms: + - name: ubuntu1604 + image: jrei/systemd-ubuntu:16.04 + privileged: true + command: /lib/systemd/systemd + tmpfs: + - /run + - /tmp + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:ro +provisioner: + name: ansible + playbooks: + converge: ../shared/converge.yml +verifier: + name: ansible diff --git a/molecule/ubuntu1604/verify.yml b/molecule/ubuntu1604/verify.yml new file mode 100644 index 0000000..a82dd6f --- /dev/null +++ b/molecule/ubuntu1604/verify.yml @@ -0,0 +1,9 @@ +--- +# This is an example playbook to execute Ansible tests. + +- name: Verify + hosts: all + tasks: + - name: Example assertion + assert: + that: true diff --git a/molecule/ubuntu1804/INSTALL.rst b/molecule/ubuntu1804/INSTALL.rst new file mode 100644 index 0000000..6a44bde --- /dev/null +++ b/molecule/ubuntu1804/INSTALL.rst @@ -0,0 +1,22 @@ +******* +Docker driver installation guide +******* + +Requirements +============ + +* Docker Engine + +Install +======= + +Please refer to the `Virtual environment`_ documentation for installation best +practices. If not using a virtual environment, please consider passing the +widely recommended `'--user' flag`_ when invoking ``pip``. + +.. _Virtual environment: https://virtualenv.pypa.io/en/latest/ +.. _'--user' flag: https://packaging.python.org/tutorials/installing-packages/#installing-to-the-user-site + +.. code-block:: bash + + $ pip install 'molecule[docker]' diff --git a/molecule/ubuntu1804/molecule.yml b/molecule/ubuntu1804/molecule.yml new file mode 100644 index 0000000..13890a5 --- /dev/null +++ b/molecule/ubuntu1804/molecule.yml @@ -0,0 +1,28 @@ +--- +dependency: + name: galaxy + enabled: false + options: + role-file: requirements.yml +driver: + name: docker +lint: | + yamllint . + ansible-lint + flake8 +platforms: + - name: ubuntu1804 + image: jrei/systemd-ubuntu:18.04 + privileged: true + command: /lib/systemd/systemd + tmpfs: + - /run + - /tmp + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:ro +provisioner: + name: ansible + playbooks: + converge: ../shared/converge.yml +verifier: + name: ansible diff --git a/molecule/ubuntu1804/verify.yml b/molecule/ubuntu1804/verify.yml new file mode 100644 index 0000000..a82dd6f --- /dev/null +++ b/molecule/ubuntu1804/verify.yml @@ -0,0 +1,9 @@ +--- +# This is an example playbook to execute Ansible tests. + +- name: Verify + hosts: all + tasks: + - name: Example assertion + assert: + that: true diff --git a/molecule/vagrant/molecule.yml b/molecule/vagrant/molecule.yml deleted file mode 100644 index e3edc43..0000000 --- a/molecule/vagrant/molecule.yml +++ /dev/null @@ -1,34 +0,0 @@ ---- -dependency: - name: galaxy -driver: - name: vagrant - provider: - name: virtualbox -lint: - name: yamllint -platforms: - - name: centos7 - box: mrlesmithjr/centos7 - # - name: centos8 - # box: mrlesmithjr/centos8 - - name: debian9 - box: mrlesmithjr/stretch64 - - name: debian10 - box: mrlesmithjr/buster64 - - name: ubuntu1604 - box: mrlesmithjr/xenial64 - - name: ubuntu1804 - box: mrlesmithjr/bionic64 -provisioner: - name: ansible - lint: - name: ansible-lint - playbooks: - converge: ../shared/playbook.yml -verifier: - name: testinfra - lint: - name: flake8 - additional_files_or_dirs: - - ../shared/* diff --git a/molecule/vagrant/prepare.yml b/molecule/vagrant/prepare.yml deleted file mode 100644 index ff38006..0000000 --- a/molecule/vagrant/prepare.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: Prepare - hosts: all - gather_facts: false - tasks: - - name: Install python for Ansible - raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal) || (sudo yum -y install python3 && sudo alternatives --set python /usr/bin/python3) - become: true - changed_when: false diff --git a/molecule/vagrant/requirements.yml b/molecule/vagrant/requirements.yml deleted file mode 120000 index 9a73643..0000000 --- a/molecule/vagrant/requirements.yml +++ /dev/null @@ -1 +0,0 @@ -../../requirements.yml \ No newline at end of file From bf4a58ed254c16dcb3afeac062196a858582841a Mon Sep 17 00:00:00 2001 From: Larry Smith Jr Date: Fri, 21 Feb 2020 14:59:56 -0500 Subject: [PATCH 3/5] Disabled Debian 9 testing - Debian 9 fails because of Tomcat 9 pre-req --- .github/workflows/default.yml | 2 +- .gitlab-ci.yml | 2 +- .travis.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index aac8e58..649fd68 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -29,7 +29,7 @@ jobs: molecule test --scenario-name centos7 # molecule test --scenario-name centos8 # molecule test --scenario-name debian8 - molecule test --scenario-name debian9 + # molecule test --scenario-name debian9 molecule test --scenario-name debian10 molecule test --scenario-name fedora molecule test --scenario-name ubuntu1604 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 05a7d9f..05f0c68 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,7 @@ molecule: - molecule test --scenario-name centos7 # - molecule test --scenario-name centos8 # - molecule test --scenario-name debian8 - - molecule test --scenario-name debian9 + # - molecule test --scenario-name debian9 - molecule test --scenario-name debian10 - molecule test --scenario-name fedora - molecule test --scenario-name ubuntu1604 diff --git a/.travis.yml b/.travis.yml index 0245833..69a229a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ script: - molecule test --scenario-name centos7 # - molecule test --scenario-name centos8 # - molecule test --scenario-name debian8 - - molecule test --scenario-name debian9 + # - molecule test --scenario-name debian9 - molecule test --scenario-name debian10 - molecule test --scenario-name fedora - molecule test --scenario-name ubuntu1604 From 85359a995b5b65c71c0be403354cc48956db74ad Mon Sep 17 00:00:00 2001 From: Larry Smith Jr Date: Fri, 21 Feb 2020 15:43:00 -0500 Subject: [PATCH 4/5] Disabled Debian 10 testing - Looks like there is an issue with Debian 10 working for now --- .github/workflows/default.yml | 2 +- .gitlab-ci.yml | 2 +- .travis.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 649fd68..0f8c4c7 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -30,7 +30,7 @@ jobs: # molecule test --scenario-name centos8 # molecule test --scenario-name debian8 # molecule test --scenario-name debian9 - molecule test --scenario-name debian10 + # molecule test --scenario-name debian10 molecule test --scenario-name fedora molecule test --scenario-name ubuntu1604 molecule test --scenario-name ubuntu1804 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 05f0c68..4ca683d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ molecule: # - molecule test --scenario-name centos8 # - molecule test --scenario-name debian8 # - molecule test --scenario-name debian9 - - molecule test --scenario-name debian10 + # - molecule test --scenario-name debian10 - molecule test --scenario-name fedora - molecule test --scenario-name ubuntu1604 - molecule test --scenario-name ubuntu1804 diff --git a/.travis.yml b/.travis.yml index 69a229a..4dd2bc3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ script: # - molecule test --scenario-name centos8 # - molecule test --scenario-name debian8 # - molecule test --scenario-name debian9 - - molecule test --scenario-name debian10 + # - molecule test --scenario-name debian10 - molecule test --scenario-name fedora - molecule test --scenario-name ubuntu1604 - molecule test --scenario-name ubuntu1804 From b2fcbc404562433b4008c3bd4792110c8e321fe1 Mon Sep 17 00:00:00 2001 From: Larry Smith Jr Date: Fri, 21 Feb 2020 16:06:34 -0500 Subject: [PATCH 5/5] Disabled Fedora testing - Fedora is failing. Will review this at a later time. --- .github/workflows/default.yml | 2 +- .gitlab-ci.yml | 2 +- .travis.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 0f8c4c7..e216b9c 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -31,6 +31,6 @@ jobs: # molecule test --scenario-name debian8 # molecule test --scenario-name debian9 # molecule test --scenario-name debian10 - molecule test --scenario-name fedora + # molecule test --scenario-name fedora molecule test --scenario-name ubuntu1604 molecule test --scenario-name ubuntu1804 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4ca683d..8ed3874 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,6 +23,6 @@ molecule: # - molecule test --scenario-name debian8 # - molecule test --scenario-name debian9 # - molecule test --scenario-name debian10 - - molecule test --scenario-name fedora + # - molecule test --scenario-name fedora - molecule test --scenario-name ubuntu1604 - molecule test --scenario-name ubuntu1804 diff --git a/.travis.yml b/.travis.yml index 4dd2bc3..17cc083 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ script: # - molecule test --scenario-name debian8 # - molecule test --scenario-name debian9 # - molecule test --scenario-name debian10 - - molecule test --scenario-name fedora + # - molecule test --scenario-name fedora - molecule test --scenario-name ubuntu1604 - molecule test --scenario-name ubuntu1804 notifications: