From 1051c4864f8f7ae733dee5c26b07d5213eeefc00 Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Tue, 16 Feb 2021 14:40:14 +0100 Subject: [PATCH] Make use of github actions --- .ansible-lint | 4 +- .github/workflows/ci.yml | 80 ++++++++++++++++++++++++++++++++++ .github/workflows/release.yml | 20 +++++++++ .travis.yml | 81 ----------------------------------- .yamllint | 15 +++++++ Dockerfile | 2 +- README.md | 2 +- Vagrantfile | 26 +++-------- meta/main.yml | 4 +- molecule/default/converge.yml | 13 ++++++ molecule/default/molecule.yml | 19 ++++++++ molecule/default/prepare.yml | 13 ++++++ molecule/default/verify.yml | 5 +++ tests/{ => tasks}/pre.yml | 6 ++- tests/test.yml | 3 +- tests/vagrant.yml | 3 +- tests/vars/_default.yml | 4 ++ tests/vars/_jessie.yml | 4 ++ tests/vars/_stretch.yml | 4 ++ tests/vars/_xenial.yml | 4 ++ 20 files changed, 201 insertions(+), 111 deletions(-) create mode 100644 .github/workflows/ci.yml create mode 100644 .github/workflows/release.yml delete mode 100644 .travis.yml create mode 100644 .yamllint create mode 100644 molecule/default/converge.yml create mode 100644 molecule/default/molecule.yml create mode 100644 molecule/default/prepare.yml create mode 100644 molecule/default/verify.yml rename tests/{ => tasks}/pre.yml (74%) create mode 100644 tests/vars/_default.yml create mode 100644 tests/vars/_jessie.yml create mode 100644 tests/vars/_stretch.yml create mode 100644 tests/vars/_xenial.yml diff --git a/.ansible-lint b/.ansible-lint index c1648fc..225ccd1 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -1,2 +1,4 @@ -skip_list: +warn_list: + - '106' + - '204' - '403' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..811c214 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,80 @@ +--- +name: CI +'on': + pull_request: + push: + branches: + - master + schedule: + - cron: '30 1 * * 3' + +jobs: + + lint: + name: Lint + runs-on: ubuntu-latest + steps: + - name: Check out the codebase + uses: actions/checkout@v2 + + - name: Set up Python 3 + uses: actions/setup-python@v2 + with: + python-version: '3.x' + + - name: Install test dependencies + run: pip install yamllint ansible-lint[core] + + - name: Lint code + run: | + yamllint . + ansible-lint + + molecule: + name: Molecule + runs-on: ubuntu-latest + defaults: + run: + working-directory: "${{ github.repository }}" + needs: + - lint + strategy: + fail-fast: false + matrix: + include: + - distro: debian8 + - distro: debian9 + - distro: debian10 + - distro: ubuntu1604 + ansible-version: '>=2.8, <2.9' + - distro: ubuntu1604 + ansible-version: '>=2.9, <2.10' + - distro: ubuntu1604 + ansible-version: '>=2.10, <2.11' + - distro: ubuntu1604 + - distro: ubuntu1804 + - distro: ubuntu2004 + + steps: + - name: Check out the codebase + uses: actions/checkout@v2 + with: + path: "${{ github.repository }}" + + - name: Set up Python 3 + uses: actions/setup-python@v2 + with: + python-version: '3.x' + + - name: Install test dependencies + run: pip install 'ansible${{ matrix.ansible-version }}' molecule[docker] docker + + - name: Run Molecule tests + run: | + molecule test + env: + ANSIBLE_FORCE_COLOR: '1' + ANSIBLE_VERBOSITY: '3' + MOLECULE_DEBUG: '1' + MOLECULE_DISTRO: "${{ matrix.distro }}" + PY_COLORS: '1' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..2354e68 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,20 @@ +--- +name: Release +'on': + push: + tags: + - '*' + +jobs: + + release: + name: Release + runs-on: ubuntu-latest + steps: + - name: Check out the codebase + uses: actions/checkout@v2 + + - name: Publish to Galaxy + uses: robertdebock/galaxy-action@1.1.0 + with: + galaxy_api_key: ${{ secrets.GALAXY_API_KEY }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 482164c..0000000 --- a/.travis.yml +++ /dev/null @@ -1,81 +0,0 @@ ---- -sudo: required -dist: xenial - -language: python -python: - - "2.7" - - "3.5" - -env: - - ANSIBLE_VERSION=latest - - ANSIBLE_VERSION=2.10.2 - - ANSIBLE_VERSION=2.10.1 - - ANSIBLE_VERSION=2.10.0 - - ANSIBLE_VERSION=2.9.14 - - ANSIBLE_VERSION=2.9.13 - - ANSIBLE_VERSION=2.9.12 - - ANSIBLE_VERSION=2.9.11 - - ANSIBLE_VERSION=2.9.10 - - ANSIBLE_VERSION=2.9.9 - - ANSIBLE_VERSION=2.9.8 - - ANSIBLE_VERSION=2.9.7 - - ANSIBLE_VERSION=2.9.6 - - ANSIBLE_VERSION=2.9.5 - - ANSIBLE_VERSION=2.9.4 - - ANSIBLE_VERSION=2.9.3 - - ANSIBLE_VERSION=2.9.2 - - ANSIBLE_VERSION=2.9.1 - - ANSIBLE_VERSION=2.9.0 - - ANSIBLE_VERSION=2.8.16 - - ANSIBLE_VERSION=2.8.15 - - ANSIBLE_VERSION=2.8.14 - - ANSIBLE_VERSION=2.8.13 - - ANSIBLE_VERSION=2.8.12 - - ANSIBLE_VERSION=2.8.11 - - ANSIBLE_VERSION=2.8.10 - - ANSIBLE_VERSION=2.8.9 - - ANSIBLE_VERSION=2.8.8 - - ANSIBLE_VERSION=2.8.7 - - ANSIBLE_VERSION=2.8.6 - - ANSIBLE_VERSION=2.8.5 - - ANSIBLE_VERSION=2.8.4 - - ANSIBLE_VERSION=2.8.3 - - ANSIBLE_VERSION=2.8.2 - - ANSIBLE_VERSION=2.8.1 - - ANSIBLE_VERSION=2.8.0 - -branches: - only: - - master - -before_install: - - sudo apt-get update -qq - -install: - # Install Ansible. - - if [ "$ANSIBLE_VERSION" = "latest" ]; then pip install ansible; else pip install ansible==$ANSIBLE_VERSION; fi - - if [ "$ANSIBLE_VERSION" = "latest" ]; then pip install ansible-lint; fi - -script: - # Check the role/playbook's syntax. - - ansible-playbook -i tests/inventory tests/test.yml --syntax-check - - # Run the role/playbook with ansible-playbook. - - ansible-playbook -i tests/inventory tests/test.yml -vvvv - - # Run the role/playbook again, checking to make sure it's idempotent. - - > - ansible-playbook -i tests/inventory tests/test.yml - | grep -q 'changed=0.*failed=0' - && (echo 'Idempotence test: pass' && exit 0) - || (echo 'Idempotence test: fail' && exit 1) - - - if [ "$ANSIBLE_VERSION" = "latest" ]; then ansible-lint tests/test.yml; fi - -notifications: - email: false - webhooks: https://galaxy.ansible.com/api/v1/notifications/ - slack: - rooms: - secure: "UpnkdzCZYECQwgNJFgyctOx0cfUIes6hXJsMYV0iOHySazvLLqfM0UGs+qIkqEv6yixzD8xFn8de2NRE4tmGN1qpIPQLgk3pyg5pFJMq2siir/ONFjFKFy0PAkZLZFYCTEQ/Z3LEq2VDKbbi0NJ2r9MglA6/Cb+9bZ6XWzFCkpPvNdVtgW0GjTQ2a4cvkUVqxhNxprPPh2TNgJq5FHAjalNtLd+jxNtq1/iwfDMWREFX8VE9PgdT7hOT39qNybnY97bcodwFeElZzyZVNzYpkNGMRcfnIa4dxMLU64riprNjUjJrfOfvJRb/VwNH8AqmxXF7ua4TMo6uoid91dY7o0yN5p6cl1upR6J17N72BDldO7BbF4nzwaHTGL0EDAzt+CWLj+JdkEett9kxgAlswH7yPWDSChiU0TqMr07walwcl7RCLKBBuvQFY7AbScfUJO02YBpYZ7IjiyLuaPWAAbVSqD9J6Ft4Mw90xii/aqkJhW5SndVQYBwBRUK+OtKxOKp9kqg5NL7tafrcco758MrII1+d18xnmJEfDGN/q04/3MS6Wsj4Pf9/KLSgL3dxZYWtCA4+PmZLCc8ULbOltccl0u7CUOx8bBlZUKCO0aetoZhckoWDvbLbkoyICohoA3lv2P4FA6t6LrsPWYODzromn2dYVA/NmI4zP5aTnnY=" diff --git a/.yamllint b/.yamllint new file mode 100644 index 0000000..894450c --- /dev/null +++ b/.yamllint @@ -0,0 +1,15 @@ +--- +extends: default + +rules: + braces: + max-spaces-inside: 1 + level: error + brackets: + max-spaces-inside: 1 + level: error + line-length: disable + truthy: disable + +ignore: | + .tox/ diff --git a/Dockerfile b/Dockerfile index 78650c6..fc89ab2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN rm -rf $HOME/.cache # ansible RUN DEBIAN_FRONTEND=noninteractive apt-get install -y gcc libffi-dev libssl-dev && \ apt-get clean -RUN pip install ansible==2.9.14 +RUN pip install ansible==2.9.15 RUN rm -rf $HOME/.cache # provision diff --git a/README.md b/README.md index c064319..9752ba8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## virtualenv -[![Build Status](https://travis-ci.org/Oefenweb/ansible-virtualenv.svg?branch=master)](https://travis-ci.org/Oefenweb/ansible-virtualenv) +[![CI](https://github.com/Oefenweb/ansible-virtualenv/workflows/CI/badge.svg)](https://github.com/Oefenweb/ansible-virtualenv/actions?query=workflow%3ACI) [![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-virtualenv-blue.svg)](https://galaxy.ansible.com/Oefenweb/virtualenv) Set up (the latest version of) virtualenv(wrapper) in Debian-like systems. diff --git a/Vagrantfile b/Vagrantfile index 3517233..a0182a0 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -4,40 +4,26 @@ role = File.basename(File.expand_path(File.dirname(__FILE__))) boxes = [ - { - :name => "ubuntu-1204", - :box => "bento/ubuntu-12.04", - :ip => '10.0.0.11', - :cpu => "50", - :ram => "256" - }, - { - :name => "ubuntu-1404", - :box => "bento/ubuntu-14.04", - :ip => '10.0.0.12', - :cpu => "50", - :ram => "256" - }, { :name => "ubuntu-1604", :box => "bento/ubuntu-16.04", - :ip => '10.0.0.13', + :ip => '10.0.0.12', :cpu => "50", :ram => "256" }, { :name => "ubuntu-1804", :box => "bento/ubuntu-18.04", - :ip => '10.0.0.14', + :ip => '10.0.0.13', :cpu => "50", :ram => "384" }, { - :name => "debian-7", - :box => "bento/debian-7", - :ip => '10.0.0.15', + :name => "ubuntu-2004", + :box => "bento/ubuntu-20.04", + :ip => '10.0.0.14', :cpu => "50", - :ram => "256" + :ram => "384" }, { :name => "debian-8", diff --git a/meta/main.yml b/meta/main.yml index f4fe0b9..6ceff74 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -10,13 +10,11 @@ galaxy_info: platforms: - name: Ubuntu versions: - - precise - - trusty - xenial - bionic + - focal - name: Debian versions: - - wheezy - jessie - stretch - buster diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml new file mode 100644 index 0000000..44670e5 --- /dev/null +++ b/molecule/default/converge.yml @@ -0,0 +1,13 @@ +--- +- name: Converge + hosts: all + become: true + pre_tasks: + - name: include variables + include_vars: "{{ item }}" + with_first_found: + - "{{ playbook_dir }}/../../tests/vars/_{{ ansible_distribution_release }}.yml" + - "{{ playbook_dir }}/../../tests/vars/_{{ ansible_distribution | lower }}.yml" + - "{{ playbook_dir }}/../../tests/vars/_default.yml" + roles: + - ../../../ diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml new file mode 100644 index 0000000..fbb7120 --- /dev/null +++ b/molecule/default/molecule.yml @@ -0,0 +1,19 @@ +--- +dependency: + name: galaxy +driver: + name: docker +platforms: + - name: instance + image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu1604}-ansible:latest" + command: ${MOLECULE_DOCKER_COMMAND:-""} + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:ro + privileged: true + pre_build_image: true +provisioner: + name: ansible + playbooks: + prepare: prepare.yml + converge: converge.yml + verify: verify.yml diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml new file mode 100644 index 0000000..db1ccc8 --- /dev/null +++ b/molecule/default/prepare.yml @@ -0,0 +1,13 @@ +--- +- name: Prepare + hosts: all + become: true + pre_tasks: + - name: include variables + include_vars: "{{ item }}" + with_first_found: + - "{{ playbook_dir }}/../../tests/vars/_{{ ansible_distribution_release }}.yml" + - "{{ playbook_dir }}/../../tests/vars/_{{ ansible_distribution | lower }}.yml" + - "{{ playbook_dir }}/../../tests/vars/_default.yml" + - name: include tasks + include: "{{ playbook_dir }}/../../tests/tasks/pre.yml" diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml new file mode 100644 index 0000000..44debad --- /dev/null +++ b/molecule/default/verify.yml @@ -0,0 +1,5 @@ +--- +- name: Verify + hosts: all + become: true + tasks: [] diff --git a/tests/pre.yml b/tests/tasks/pre.yml similarity index 74% rename from tests/pre.yml rename to tests/tasks/pre.yml index 201dfcf..9c4e688 100644 --- a/tests/pre.yml +++ b/tests/tasks/pre.yml @@ -11,7 +11,9 @@ - name: pre | install pip shell: > - curl -sL https://bootstrap.pypa.io/get-pip.py | python{{ virtualenv_python_version | string }} - + curl -sL {{ virtualenv_get_pip_url }} | python{{ virtualenv_python_version | string }} - args: - warn: false + warn: false changed_when: false + tags: + - skip_ansible_lint diff --git a/tests/test.yml b/tests/test.yml index e919fd5..ecda59c 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -4,7 +4,8 @@ connection: local become: true pre_tasks: - - include: pre.yml + - name: include tasks + include: "{{ playbook_dir }}/tasks/pre.yml" roles: - ../../ # vars: diff --git a/tests/vagrant.yml b/tests/vagrant.yml index 6127b2f..2d37eef 100644 --- a/tests/vagrant.yml +++ b/tests/vagrant.yml @@ -4,6 +4,7 @@ remote_user: vagrant become: true pre_tasks: - - include: pre.yml + - name: include tasks + include: "{{ playbook_dir }}/tasks/pre.yml" roles: - ../../ diff --git a/tests/vars/_default.yml b/tests/vars/_default.yml new file mode 100644 index 0000000..10365e7 --- /dev/null +++ b/tests/vars/_default.yml @@ -0,0 +1,4 @@ +# vars file for virtualenv +--- +virtualenv_python_version: 3 +virtualenv_get_pip_url: 'https://bootstrap.pypa.io/get-pip.py' diff --git a/tests/vars/_jessie.yml b/tests/vars/_jessie.yml new file mode 100644 index 0000000..bb376a4 --- /dev/null +++ b/tests/vars/_jessie.yml @@ -0,0 +1,4 @@ +# vars file for virtualenv +--- +virtualenv_python_version: 2 +virtualenv_get_pip_url: 'https://bootstrap.pypa.io/2.7/get-pip.py' diff --git a/tests/vars/_stretch.yml b/tests/vars/_stretch.yml new file mode 100644 index 0000000..bb376a4 --- /dev/null +++ b/tests/vars/_stretch.yml @@ -0,0 +1,4 @@ +# vars file for virtualenv +--- +virtualenv_python_version: 2 +virtualenv_get_pip_url: 'https://bootstrap.pypa.io/2.7/get-pip.py' diff --git a/tests/vars/_xenial.yml b/tests/vars/_xenial.yml new file mode 100644 index 0000000..7d64003 --- /dev/null +++ b/tests/vars/_xenial.yml @@ -0,0 +1,4 @@ +# vars file for pip +--- +virtualenv_python_version: 3 +virtualenv_get_pip_url: 'https://bootstrap.pypa.io/3.5/get-pip.py'