From 4535975d3225cd76603363b8f4c625f6462aae09 Mon Sep 17 00:00:00 2001 From: Rickkwa Date: Sat, 30 Oct 2021 22:50:45 +0000 Subject: [PATCH 1/9] Convert travis to github actions --- .github/workflows/molecule-test.yml | 36 +++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/molecule-test.yml diff --git a/.github/workflows/molecule-test.yml b/.github/workflows/molecule-test.yml new file mode 100644 index 0000000..ff2c774 --- /dev/null +++ b/.github/workflows/molecule-test.yml @@ -0,0 +1,36 @@ +--- +name: Molecule Test +on: [push] +jobs: + build: + runs-on: ubuntu-latest + strategy: + fail-fast: false + max-parallel: 4 + matrix: + ansible_version: ["~=2.5.0", "~=2.6.0", "~=2.7.0", "~=2.8.0", ""] + + env: + ANSIBLE_FORCE_COLOR: true + + steps: + - uses: actions/checkout@v2 + - name: Set up Python 3 + uses: actions/setup-python@v2 + with: + python-version: '3.x' + - name: Install dependencies + env: + ANSIBLE_VER: ${{ matrix.ansible_version }} + MOLECULE_VER: "~=2.22.0" + run: | + python -m pip install --upgrade pip + pip install ansible$ANSIBLE_VER molecule$MOLECULE_VER docker molecule-docker + - name: Show versions + run: | + python --version + docker --version + ansible --version + - name: Test with molecule + run: | + molecule test --all From 9685fc910eef9eeedba34f17ccf5ab1b7f686085 Mon Sep 17 00:00:00 2001 From: Rickkwa Date: Sat, 30 Oct 2021 22:55:59 +0000 Subject: [PATCH 2/9] Start with latest versions --- .github/workflows/molecule-test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/molecule-test.yml b/.github/workflows/molecule-test.yml index ff2c774..aaa9e32 100644 --- a/.github/workflows/molecule-test.yml +++ b/.github/workflows/molecule-test.yml @@ -7,8 +7,8 @@ jobs: strategy: fail-fast: false max-parallel: 4 - matrix: - ansible_version: ["~=2.5.0", "~=2.6.0", "~=2.7.0", "~=2.8.0", ""] + #matrix: + # ansible_version: ["~=2.5.0", "~=2.6.0", "~=2.7.0", "~=2.8.0", ""] env: ANSIBLE_FORCE_COLOR: true @@ -20,12 +20,12 @@ jobs: with: python-version: '3.x' - name: Install dependencies - env: - ANSIBLE_VER: ${{ matrix.ansible_version }} - MOLECULE_VER: "~=2.22.0" + #env: + # ANSIBLE_VER: ${{ matrix.ansible_version }} + # MOLECULE_VER: "~=2.22.0" run: | python -m pip install --upgrade pip - pip install ansible$ANSIBLE_VER molecule$MOLECULE_VER docker molecule-docker + pip install ansible molecule docker molecule-docker - name: Show versions run: | python --version From 71936547059d1c25789e7337b4f90603d1f627e3 Mon Sep 17 00:00:00 2001 From: Rickkwa Date: Sat, 30 Oct 2021 23:00:38 +0000 Subject: [PATCH 3/9] Remove travis --- .travis.yml | 28 ---------------------------- .yamllint | 13 ------------- molecule/default/molecule.yml | 5 ----- 3 files changed, 46 deletions(-) delete mode 100755 .travis.yml delete mode 100644 .yamllint diff --git a/.travis.yml b/.travis.yml deleted file mode 100755 index 1fc7046..0000000 --- a/.travis.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -notifications: - email: false - -language: python - -python: 3.6 - -env: - - ANSIBLE_VER="~=2.5.0" MOLECULE_VER="~=2.22.0" - - ANSIBLE_VER="~=2.6.0" MOLECULE_VER="~=2.22.0" - - ANSIBLE_VER="~=2.7.0" MOLECULE_VER="~=2.22.0" - - ANSIBLE_VER="~=2.8.0" MOLECULE_VER="~=2.22.0" - - ANSIBLE_VER="" MOLECULE_VER="" - -sudo: true - -services: - - docker - -install: - - sudo apt-get install -y python-pip libssl-dev - - pip install docker-py ansible${ANSIBLE_VER} molecule${MOLECULE_VER} - -script: - - ansible --version - - molecule --version - - molecule test --all diff --git a/.yamllint b/.yamllint deleted file mode 100644 index 3a2255e..0000000 --- a/.yamllint +++ /dev/null @@ -1,13 +0,0 @@ -extends: default - -rules: - braces: - max-spaces-inside: 1 - level: error - brackets: - max-spaces-inside: 1 - level: error - line-length: disable - # NOTE(retr0h): Templates no longer fail this lint rule. - # Uncomment if running old Molecule templates. - # truthy: disable diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 9d72df0..a63091d 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -35,13 +35,8 @@ platforms: privileged: true driver: name: docker -lint: - name: yamllint provisioner: name: ansible - lint: - name: ansible-lint - log: true verifier: name: testinfra lint: From b34c1168b4425aa93db744bf9f9ddb0f1286aba4 Mon Sep 17 00:00:00 2001 From: Rickkwa Date: Sat, 30 Oct 2021 23:03:55 +0000 Subject: [PATCH 4/9] Update other scenario --- .github/workflows/molecule-test.yml | 5 ----- molecule/delete-user-group/molecule.yml | 4 ---- 2 files changed, 9 deletions(-) diff --git a/.github/workflows/molecule-test.yml b/.github/workflows/molecule-test.yml index aaa9e32..ac4d4fa 100644 --- a/.github/workflows/molecule-test.yml +++ b/.github/workflows/molecule-test.yml @@ -7,8 +7,6 @@ jobs: strategy: fail-fast: false max-parallel: 4 - #matrix: - # ansible_version: ["~=2.5.0", "~=2.6.0", "~=2.7.0", "~=2.8.0", ""] env: ANSIBLE_FORCE_COLOR: true @@ -20,9 +18,6 @@ jobs: with: python-version: '3.x' - name: Install dependencies - #env: - # ANSIBLE_VER: ${{ matrix.ansible_version }} - # MOLECULE_VER: "~=2.22.0" run: | python -m pip install --upgrade pip pip install ansible molecule docker molecule-docker diff --git a/molecule/delete-user-group/molecule.yml b/molecule/delete-user-group/molecule.yml index 3142821..d219026 100644 --- a/molecule/delete-user-group/molecule.yml +++ b/molecule/delete-user-group/molecule.yml @@ -34,12 +34,8 @@ platforms: privileged: true driver: name: docker -lint: - name: yamllint provisioner: name: ansible - lint: - name: ansible-lint log: true verifier: name: testinfra From bd3c1514fab9223e044978d6be74569d6056b0b0 Mon Sep 17 00:00:00 2001 From: Rickkwa Date: Sat, 30 Oct 2021 23:12:55 +0000 Subject: [PATCH 5/9] Remove lint keyword --- molecule/default/molecule.yml | 2 -- molecule/delete-user-group/molecule.yml | 3 --- 2 files changed, 5 deletions(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index a63091d..4678c9c 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -39,5 +39,3 @@ provisioner: name: ansible verifier: name: testinfra - lint: - name: flake8 diff --git a/molecule/delete-user-group/molecule.yml b/molecule/delete-user-group/molecule.yml index d219026..85d74a2 100644 --- a/molecule/delete-user-group/molecule.yml +++ b/molecule/delete-user-group/molecule.yml @@ -36,8 +36,5 @@ driver: name: docker provisioner: name: ansible - log: true verifier: name: testinfra - lint: - name: flake8 From 016bde511bdca42e6055cc1440926516ae719bfd Mon Sep 17 00:00:00 2001 From: Rickkwa Date: Sat, 30 Oct 2021 23:17:24 +0000 Subject: [PATCH 6/9] Update galaxy info --- meta/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/main.yml b/meta/main.yml index 4ce6753..69f9049 100755 --- a/meta/main.yml +++ b/meta/main.yml @@ -5,6 +5,8 @@ galaxy_info: description: "Manages user accounts, groups, and sudoers using a centralized user/group inventory." license: "MIT" min_ansible_version: 2.5 + role_name: user-management + namespace: rickkwa category: - system platforms: From d3de4af14f3720f0029e2edde5ddf90bed898043 Mon Sep 17 00:00:00 2001 From: Rickkwa Date: Sat, 30 Oct 2021 23:23:23 +0000 Subject: [PATCH 7/9] Remove hyphen for underscore --- meta/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index 69f9049..7a95726 100755 --- a/meta/main.yml +++ b/meta/main.yml @@ -3,10 +3,10 @@ galaxy_info: author: Ricky Kwan description: "Manages user accounts, groups, and sudoers using a centralized user/group inventory." + role_name: "user_management" + namespace: "rickkwa" license: "MIT" min_ansible_version: 2.5 - role_name: user-management - namespace: rickkwa category: - system platforms: From 4dd65e99004f6dacb3ff712b8e0116dc7c15f78c Mon Sep 17 00:00:00 2001 From: Rickkwa Date: Sat, 30 Oct 2021 23:52:33 +0000 Subject: [PATCH 8/9] install pytest and testinfra --- .github/workflows/molecule-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/molecule-test.yml b/.github/workflows/molecule-test.yml index ac4d4fa..adde7b0 100644 --- a/.github/workflows/molecule-test.yml +++ b/.github/workflows/molecule-test.yml @@ -20,7 +20,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install ansible molecule docker molecule-docker + pip install ansible molecule docker molecule-docker pytest pytest-testinfra - name: Show versions run: | python --version From 951a1d987de77c9f13c83dc9ca90e723ed8e8b8f Mon Sep 17 00:00:00 2001 From: Rickkwa Date: Sun, 31 Oct 2021 00:54:45 +0000 Subject: [PATCH 9/9] Remove travis badge --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index ae03458..bd0a9a5 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ Ansible User Management Role ==== -[![Build Status](https://travis-ci.com/Rickkwa/ansible-user-management.svg?branch=master)](https://travis-ci.com/Rickkwa/ansible-user-management) [![Ansible Role](https://img.shields.io/ansible/role/d/27347.svg)](https://galaxy.ansible.com/rickkwa/user_management) [![license](https://img.shields.io/github/license/Rickkwa/ansible-user-management.svg)](https://github.com/Rickkwa/ansible-user-management/blob/master/LICENSE.md)