From 65dc4c55130fd97db788cb15c9ae04d7d721127e Mon Sep 17 00:00:00 2001 From: ducoterra Date: Mon, 31 Jan 2022 16:39:25 -0500 Subject: [PATCH] Align naming scheme for "daily drivers" installs Daily driver installs from pacman, yay, and snap should all share a similar naming convention. This will be "_daily_drivers" from now on. --- ansible/pacman_daily_drivers/tasks/main.yml | 1 + ansible/setup-full.yml | 9 ++-- .../.travis.yml | 0 .../README.md | 0 .../defaults/main.yml | 0 .../handlers/main.yml | 0 .../meta/main.yml | 0 .../tasks/main.yml | 6 --- .../tests/inventory | 0 ansible/snap_daily_drivers/tests/test.yml | 5 ++ .../vars/main.yml | 0 ansible/yay_daily_drivers/.travis.yml | 29 +++++++++++ ansible/yay_daily_drivers/README.md | 38 ++++++++++++++ ansible/yay_daily_drivers/defaults/main.yml | 2 + ansible/yay_daily_drivers/handlers/main.yml | 2 + ansible/yay_daily_drivers/meta/main.yml | 52 +++++++++++++++++++ ansible/yay_daily_drivers/tasks/main.yml | 3 ++ ansible/yay_daily_drivers/tests/inventory | 2 + .../tests/test.yml | 2 +- ansible/yay_daily_drivers/vars/main.yml | 2 + 20 files changed, 143 insertions(+), 10 deletions(-) rename ansible/{arch_snap => snap_daily_drivers}/.travis.yml (100%) rename ansible/{arch_snap => snap_daily_drivers}/README.md (100%) rename ansible/{arch_snap => snap_daily_drivers}/defaults/main.yml (100%) rename ansible/{arch_snap => snap_daily_drivers}/handlers/main.yml (100%) rename ansible/{arch_snap => snap_daily_drivers}/meta/main.yml (100%) rename ansible/{arch_snap => snap_daily_drivers}/tasks/main.yml (85%) rename ansible/{arch_snap => snap_daily_drivers}/tests/inventory (100%) create mode 100644 ansible/snap_daily_drivers/tests/test.yml rename ansible/{arch_snap => snap_daily_drivers}/vars/main.yml (100%) create mode 100644 ansible/yay_daily_drivers/.travis.yml create mode 100644 ansible/yay_daily_drivers/README.md create mode 100644 ansible/yay_daily_drivers/defaults/main.yml create mode 100644 ansible/yay_daily_drivers/handlers/main.yml create mode 100644 ansible/yay_daily_drivers/meta/main.yml create mode 100644 ansible/yay_daily_drivers/tasks/main.yml create mode 100644 ansible/yay_daily_drivers/tests/inventory rename ansible/{arch_snap => yay_daily_drivers}/tests/test.yml (68%) create mode 100644 ansible/yay_daily_drivers/vars/main.yml diff --git a/ansible/pacman_daily_drivers/tasks/main.yml b/ansible/pacman_daily_drivers/tasks/main.yml index a0ee7c6..0f84b98 100644 --- a/ansible/pacman_daily_drivers/tasks/main.yml +++ b/ansible/pacman_daily_drivers/tasks/main.yml @@ -22,5 +22,6 @@ - helm - python - python-pip + - make state: present become: yes diff --git a/ansible/setup-full.yml b/ansible/setup-full.yml index 1dac21c..7f123fb 100644 --- a/ansible/setup-full.yml +++ b/ansible/setup-full.yml @@ -21,6 +21,12 @@ - role: pacman_daily_drivers tags: ["pacman"] + - role: yay_daily_drivers + tags: ["yay"] + + - role: snap_daily_drivers + tags: ["snap"] + - role: arch_openssh tags: ["ssh"] @@ -56,9 +62,6 @@ - role: vault_cli tags: ["vault"] - - - role: arch_snap - tags: ["snap"] - role: arch_swap tags: ["swap"] diff --git a/ansible/arch_snap/.travis.yml b/ansible/snap_daily_drivers/.travis.yml similarity index 100% rename from ansible/arch_snap/.travis.yml rename to ansible/snap_daily_drivers/.travis.yml diff --git a/ansible/arch_snap/README.md b/ansible/snap_daily_drivers/README.md similarity index 100% rename from ansible/arch_snap/README.md rename to ansible/snap_daily_drivers/README.md diff --git a/ansible/arch_snap/defaults/main.yml b/ansible/snap_daily_drivers/defaults/main.yml similarity index 100% rename from ansible/arch_snap/defaults/main.yml rename to ansible/snap_daily_drivers/defaults/main.yml diff --git a/ansible/arch_snap/handlers/main.yml b/ansible/snap_daily_drivers/handlers/main.yml similarity index 100% rename from ansible/arch_snap/handlers/main.yml rename to ansible/snap_daily_drivers/handlers/main.yml diff --git a/ansible/arch_snap/meta/main.yml b/ansible/snap_daily_drivers/meta/main.yml similarity index 100% rename from ansible/arch_snap/meta/main.yml rename to ansible/snap_daily_drivers/meta/main.yml diff --git a/ansible/arch_snap/tasks/main.yml b/ansible/snap_daily_drivers/tasks/main.yml similarity index 85% rename from ansible/arch_snap/tasks/main.yml rename to ansible/snap_daily_drivers/tasks/main.yml index 5fcf358..f843f2d 100644 --- a/ansible/arch_snap/tasks/main.yml +++ b/ansible/snap_daily_drivers/tasks/main.yml @@ -26,12 +26,6 @@ become: yes retries: 6 delay: 10 -- name: Install vscode - community.general.snap: - name: code - state: present - classic: yes - become: yes - name: Install spotify community.general.snap: name: spotify diff --git a/ansible/arch_snap/tests/inventory b/ansible/snap_daily_drivers/tests/inventory similarity index 100% rename from ansible/arch_snap/tests/inventory rename to ansible/snap_daily_drivers/tests/inventory diff --git a/ansible/snap_daily_drivers/tests/test.yml b/ansible/snap_daily_drivers/tests/test.yml new file mode 100644 index 0000000..36544f5 --- /dev/null +++ b/ansible/snap_daily_drivers/tests/test.yml @@ -0,0 +1,5 @@ +--- +- hosts: localhost + remote_user: root + roles: + - snap_daily_drivers diff --git a/ansible/arch_snap/vars/main.yml b/ansible/snap_daily_drivers/vars/main.yml similarity index 100% rename from ansible/arch_snap/vars/main.yml rename to ansible/snap_daily_drivers/vars/main.yml diff --git a/ansible/yay_daily_drivers/.travis.yml b/ansible/yay_daily_drivers/.travis.yml new file mode 100644 index 0000000..36bbf62 --- /dev/null +++ b/ansible/yay_daily_drivers/.travis.yml @@ -0,0 +1,29 @@ +--- +language: python +python: "2.7" + +# Use the new container infrastructure +sudo: false + +# Install ansible +addons: + apt: + packages: + - python-pip + +install: + # Install ansible + - pip install ansible + + # Check ansible version + - ansible --version + + # Create ansible.cfg with correct roles_path + - printf '[defaults]\nroles_path=../' >ansible.cfg + +script: + # Basic role syntax check + - ansible-playbook tests/test.yml -i tests/inventory --syntax-check + +notifications: + webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file diff --git a/ansible/yay_daily_drivers/README.md b/ansible/yay_daily_drivers/README.md new file mode 100644 index 0000000..225dd44 --- /dev/null +++ b/ansible/yay_daily_drivers/README.md @@ -0,0 +1,38 @@ +Role Name +========= + +A brief description of the role goes here. + +Requirements +------------ + +Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. + +Role Variables +-------------- + +A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. + +Dependencies +------------ + +A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. + +Example Playbook +---------------- + +Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: + + - hosts: servers + roles: + - { role: username.rolename, x: 42 } + +License +------- + +BSD + +Author Information +------------------ + +An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/ansible/yay_daily_drivers/defaults/main.yml b/ansible/yay_daily_drivers/defaults/main.yml new file mode 100644 index 0000000..c3369db --- /dev/null +++ b/ansible/yay_daily_drivers/defaults/main.yml @@ -0,0 +1,2 @@ +--- +# defaults file for yay_daily_drivers diff --git a/ansible/yay_daily_drivers/handlers/main.yml b/ansible/yay_daily_drivers/handlers/main.yml new file mode 100644 index 0000000..b62dadb --- /dev/null +++ b/ansible/yay_daily_drivers/handlers/main.yml @@ -0,0 +1,2 @@ +--- +# handlers file for yay_daily_drivers diff --git a/ansible/yay_daily_drivers/meta/main.yml b/ansible/yay_daily_drivers/meta/main.yml new file mode 100644 index 0000000..c572acc --- /dev/null +++ b/ansible/yay_daily_drivers/meta/main.yml @@ -0,0 +1,52 @@ +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/ansible/yay_daily_drivers/tasks/main.yml b/ansible/yay_daily_drivers/tasks/main.yml new file mode 100644 index 0000000..507011c --- /dev/null +++ b/ansible/yay_daily_drivers/tasks/main.yml @@ -0,0 +1,3 @@ +--- +- name: Install vscode + command: yay -S visual-studio-code-bin --noconfirm diff --git a/ansible/yay_daily_drivers/tests/inventory b/ansible/yay_daily_drivers/tests/inventory new file mode 100644 index 0000000..878877b --- /dev/null +++ b/ansible/yay_daily_drivers/tests/inventory @@ -0,0 +1,2 @@ +localhost + diff --git a/ansible/arch_snap/tests/test.yml b/ansible/yay_daily_drivers/tests/test.yml similarity index 68% rename from ansible/arch_snap/tests/test.yml rename to ansible/yay_daily_drivers/tests/test.yml index 933e652..b0da9ec 100644 --- a/ansible/arch_snap/tests/test.yml +++ b/ansible/yay_daily_drivers/tests/test.yml @@ -2,4 +2,4 @@ - hosts: localhost remote_user: root roles: - - arch_snap + - yay_daily_drivers diff --git a/ansible/yay_daily_drivers/vars/main.yml b/ansible/yay_daily_drivers/vars/main.yml new file mode 100644 index 0000000..4b5546a --- /dev/null +++ b/ansible/yay_daily_drivers/vars/main.yml @@ -0,0 +1,2 @@ +--- +# vars file for yay_daily_drivers