From 467ddc50e5e963dcac94059370c5618dba971954 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Sat, 21 May 2022 21:35:30 +0200 Subject: [PATCH] Feat: Add test for archlinux and debian --- roles/core/defaults/main.yml | 28 +++++++++++++ roles/core/meta/main.yml | 52 ------------------------ roles/core/molecule/default/converge.yml | 1 + roles/core/molecule/default/molecule.yml | 12 +++++- roles/core/tasks/archlinux.yml | 7 ++++ roles/core/tasks/debian.yml | 6 +++ roles/core/tasks/main.yml | 7 +--- 7 files changed, 55 insertions(+), 58 deletions(-) delete mode 100644 roles/core/meta/main.yml create mode 100644 roles/core/tasks/archlinux.yml create mode 100644 roles/core/tasks/debian.yml diff --git a/roles/core/defaults/main.yml b/roles/core/defaults/main.yml index 75df229..1d84249 100644 --- a/roles/core/defaults/main.yml +++ b/roles/core/defaults/main.yml @@ -35,3 +35,31 @@ pacman_admin: pacman_pkgs: - "{{ pacman_base }}" - "{{ pacman_admin }}" + + +debian_base: + - vim + - tmux + - git + - gnupg + - zsh + - sudo + +debian_admin: + - wget + - ruby + - htop + - iotop + - nmap + - sshpass + - rsync + - unzip + - cifs-utils + - traceroute + - smartmontools + - vifm + - w3m + +debian_pkgs: + - "{{ debian_base }}" + - "{{ debian_admin }}" diff --git a/roles/core/meta/main.yml b/roles/core/meta/main.yml deleted file mode 100644 index c572acc..0000000 --- a/roles/core/meta/main.yml +++ /dev/null @@ -1,52 +0,0 @@ -galaxy_info: - author: your name - description: your role description - company: your company (optional) - - # If the issue tracker for your role is not on github, uncomment the - # next line and provide a value - # issue_tracker_url: http://example.com/issue/tracker - - # Choose a valid license ID from https://spdx.org - some suggested licenses: - # - BSD-3-Clause (default) - # - MIT - # - GPL-2.0-or-later - # - GPL-3.0-only - # - Apache-2.0 - # - CC-BY-4.0 - license: license (GPL-2.0-or-later, MIT, etc) - - min_ansible_version: 2.1 - - # If this a Container Enabled role, provide the minimum Ansible Container version. - # min_ansible_container_version: - - # - # Provide a list of supported platforms, and for each platform a list of versions. - # If you don't wish to enumerate all versions for a particular platform, use 'all'. - # To view available platforms and versions (or releases), visit: - # https://galaxy.ansible.com/api/v1/platforms/ - # - # platforms: - # - name: Fedora - # versions: - # - all - # - 25 - # - name: SomePlatform - # versions: - # - all - # - 1.0 - # - 7 - # - 99.99 - - galaxy_tags: [] - # List tags for your role here, one per line. A tag is a keyword that describes - # and categorizes the role. Users find roles by searching for tags. Be sure to - # remove the '[]' above, if you add tags to this list. - # - # NOTE: A tag is limited to a single word comprised of alphanumeric characters. - # Maximum 20 tags per role. - -dependencies: [] - # List your role dependencies here, one per line. Be sure to remove the '[]' above, - # if you add dependencies to this list. diff --git a/roles/core/molecule/default/converge.yml b/roles/core/molecule/default/converge.yml index f689ebd..d88f48a 100644 --- a/roles/core/molecule/default/converge.yml +++ b/roles/core/molecule/default/converge.yml @@ -1,6 +1,7 @@ --- - name: Converge hosts: all + become: yes tasks: - name: "Include core" include_role: diff --git a/roles/core/molecule/default/molecule.yml b/roles/core/molecule/default/molecule.yml index 748eb79..21e3c5f 100644 --- a/roles/core/molecule/default/molecule.yml +++ b/roles/core/molecule/default/molecule.yml @@ -1,10 +1,20 @@ --- dependency: name: galaxy + driver: name: vagrant + provider: + name: virtualbox + platforms: - - name: instance + - name: archlinux + box: "archlinux/archlinux" + pre_build_image: true + - name: Debian + box: "debian/bullseye64" + pre_build_image: true + provisioner: name: ansible verifier: diff --git a/roles/core/tasks/archlinux.yml b/roles/core/tasks/archlinux.yml new file mode 100644 index 0000000..d907b71 --- /dev/null +++ b/roles/core/tasks/archlinux.yml @@ -0,0 +1,7 @@ +--- +- name: Archlinux - Install pkgs + community.general.pacman: + name: "{{ item }}" + state: present + with_items: "{{ pacman_pkgs }}" + diff --git a/roles/core/tasks/debian.yml b/roles/core/tasks/debian.yml new file mode 100644 index 0000000..0efea95 --- /dev/null +++ b/roles/core/tasks/debian.yml @@ -0,0 +1,6 @@ +--- +- name: Debian - Install pkgs + apt: + name: "{{ item }}" + state: present + with_items: "{{ debian_pkgs }}" diff --git a/roles/core/tasks/main.yml b/roles/core/tasks/main.yml index 8fe831e..e9e6cef 100644 --- a/roles/core/tasks/main.yml +++ b/roles/core/tasks/main.yml @@ -1,10 +1,7 @@ --- # tasks file for core -- name: Install pkgs - community.general.pacman: - name: "{{ item }}" - state: present - with_items: "{{ pacman_pkgs }}" +- name: Install os-specific packages + include_tasks: "{{ ansible_os_family | lower }}.yml" - name: Configure sudoers template: