From 3b7584b5ebcd04e81f468e7857ab01cdc2ebe088 Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Sat, 30 Jan 2021 13:43:46 +0100 Subject: [PATCH 1/2] Make use of github actions --- .ansible-lint | 2 + .github/workflows/ci.yml | 81 +++++++++++++++++++++++++++++++++++ .github/workflows/release.yml | 20 +++++++++ .travis.yml | 81 ----------------------------------- .yamllint | 15 +++++++ Dockerfile | 2 +- README.md | 5 ++- Vagrantfile | 26 +++-------- meta/main.yml | 4 +- molecule/default/converge.yml | 6 +++ molecule/default/molecule.yml | 19 ++++++++ molecule/default/prepare.yml | 5 +++ molecule/default/verify.yml | 5 +++ tasks/repository.yml | 6 +-- vars/main.yml | 7 ++- 15 files changed, 171 insertions(+), 113 deletions(-) create mode 100644 .ansible-lint 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 diff --git a/.ansible-lint b/.ansible-lint new file mode 100644 index 0000000..c099c60 --- /dev/null +++ b/.ansible-lint @@ -0,0 +1,2 @@ +warn_list: + - '106' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..73f127a --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,81 @@ +--- +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 + + - 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 + ansible-version: '<2.10' + - 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: '2' + 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 b6b3df6..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: "BNXPrm8vO0+u7hew4ohjwIcOQ4zRd9rOXQoFud6mRmgsNv6m35/xvEfQGgG/s2pI3CtWyjFrIzgMyrw18lNBpP0sLup0FJ2tGsS7DAk796KCwrpVxlv3y1q5y3TNeqWXAodYlMjc06E6+K6S0ZK+nbJusYsL4Wv6OtMl8uElMCcmkcSmI2eh/ruYsUnXneRN8kGwE6qqRJ9onnnc7IblEcD67vcjX+86qxhzG9s8OSj0dTtQgBZX2n5sRmp6l0Nmid4paMTDJxVkindn1MuoPPGb/rvNU6BBVJn7MyqihfN5NHM70ND7qxNZduNxMSadwqlxRbkFNKFu1MnAuvzQwsm9HP0A7wfRUOoEBcW7+K2jmT2Dft8wJdmPBKY2IfcxhqTgBjDPieW8kc667nxgHiM03OR535Y6VSlp+gBUIYoIaQA7Az9FhWZn1AgYPzeVtTnlNSDo0Fzn4S+GPUAPO2gP5z/MFHPRuKb0DyU2y2WtjxndkOhcS7sCDQIZsX+SNxQj5Z1o5Jr6sVkkPQ7uDjzwHPXtSNbR4FE84RJLncK4Q9yO/stuFZdMG/sGS7M+ZS6ioUbD8wBjSGdsU3EtUGlpfFWkxivFRuDoVz/Csy/IGl43Yu3B8yZeTc2eBRNBytKMk6c2lxTOo8jMAajCaxIavE1rl4ftAm8gnJe/Gzc=" 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 6bda589..4af5e60 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,14 @@ ## percona-toolkit -[![Build Status](https://travis-ci.org/Oefenweb/ansible-percona-toolkit.svg?branch=master)](https://travis-ci.org/Oefenweb/ansible-percona-toolkit) +[![CI](https://github.com/Oefenweb/ansible-percona-toolkit/workflows/CI/badge.svg)](https://github.com/Oefenweb/ansible-percona-toolkit/actions?query=workflow%3ACI) [![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-percona--toolkit-blue.svg)](https://galaxy.ansible.com/Oefenweb/percona-toolkit) Manage [percona-toolkit](https://www.percona.com/software/mysql-tools/percona-toolkit) in Debian-like systems. #### Requirements -None +* `software-properties-common` (will be installed) +* `dirmngr` (will be installed) #### Variables 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 7956640..82fa7ce 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..be762b2 --- /dev/null +++ b/molecule/default/converge.yml @@ -0,0 +1,6 @@ +--- +- name: Converge + hosts: all + become: true + 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..9a6673d --- /dev/null +++ b/molecule/default/prepare.yml @@ -0,0 +1,5 @@ +--- +- name: Prepare + hosts: all + become: true + tasks: [] 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/tasks/repository.yml b/tasks/repository.yml index da86cbb..d0e80fc 100644 --- a/tasks/repository.yml +++ b/tasks/repository.yml @@ -1,13 +1,11 @@ # tasks file for percona-toolkit --- -- name: repository | install | dependencies +- name: repository | install | dependencies (pre) apt: - name: - - dirmngr + name: "{{ percona_toolkit_dependencies_pre }}" state: "{{ apt_install_state | default('latest') }}" update_cache: true cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}" - when: ansible_distribution == 'Debian' and ansible_distribution_version is version('9', '>=') tags: - percona-toolkit-repository-install - percona-toolkit-repository-install-dependencies diff --git a/vars/main.yml b/vars/main.yml index 970bbb6..2d577f2 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -2,11 +2,14 @@ --- percona_toolkit_repositories: - type: deb - url: "http://repo.percona.com/apt {{ ansible_lsb.codename }}" + url: "http://repo.percona.com/apt {{ ansible_distribution_release }}" component: main - type: deb-src - url: "http://repo.percona.com/apt {{ ansible_lsb.codename }}" + url: "http://repo.percona.com/apt {{ ansible_distribution_release }}" component: main +percona_toolkit_dependencies_pre: + - software-properties-common + percona_toolkit_dependencies: - percona-toolkit From 1d993c463aee680f11b78fb1e7bf0c8f43921310 Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Mon, 1 Feb 2021 10:51:56 +0100 Subject: [PATCH 2/2] Consistency changes --- vars/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/main.yml b/vars/main.yml index 2d577f2..55b6ea8 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -10,6 +10,7 @@ percona_toolkit_repositories: percona_toolkit_dependencies_pre: - software-properties-common + - dirmngr percona_toolkit_dependencies: - percona-toolkit