From 8e064fb15620a6632945fd3b87ce6a5147ae5f31 Mon Sep 17 00:00:00 2001 From: Florian Piesche <79453505+florianpiesche@users.noreply.github.com> Date: Tue, 20 Aug 2024 18:29:05 +0100 Subject: [PATCH 01/10] Add currently-included roles as dependencies (NO_JIRA) --- meta/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/main.yml b/meta/main.yml index b53b001..6993c84 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -36,4 +36,6 @@ galaxy_info: - desktop - integrationtesting -dependencies: [] +dependencies: + - role: ccdc.package_manager_configuration + - role: geerlingguy.mac.homebrew From 5f59de03c39a692903a0a2ac5604f1d6e398238a Mon Sep 17 00:00:00 2001 From: Florian Piesche <79453505+florianpiesche@users.noreply.github.com> Date: Tue, 20 Aug 2024 18:29:43 +0100 Subject: [PATCH 02/10] Remove explicit include_role (NO_JIRA) --- tasks/RedHat.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml index 6b259b9..f1a1d45 100644 --- a/tasks/RedHat.yml +++ b/tasks/RedHat.yml @@ -1,8 +1,4 @@ --- -- name: Set up package managers for required tools - ansible.builtin.include_role: - name: ccdc.package_manager_configuration - - name: Install desktop environment ansible.builtin.package: name: "{{ package }}" From e5aeff3a89e8e1f088a931aaf10e5bbd460a1bcf Mon Sep 17 00:00:00 2001 From: Florian Piesche <79453505+florianpiesche@users.noreply.github.com> Date: Tue, 20 Aug 2024 18:30:20 +0100 Subject: [PATCH 03/10] Remove explicit `include_role` (NO_JIRA) --- tasks/AlmaLinux.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tasks/AlmaLinux.yml b/tasks/AlmaLinux.yml index 6b259b9..f1a1d45 100644 --- a/tasks/AlmaLinux.yml +++ b/tasks/AlmaLinux.yml @@ -1,8 +1,4 @@ --- -- name: Set up package managers for required tools - ansible.builtin.include_role: - name: ccdc.package_manager_configuration - - name: Install desktop environment ansible.builtin.package: name: "{{ package }}" From ecaee620a10a8e1c7626e4e36b3c559c6308a515 Mon Sep 17 00:00:00 2001 From: Florian Piesche <79453505+florianpiesche@users.noreply.github.com> Date: Tue, 20 Aug 2024 18:31:13 +0100 Subject: [PATCH 04/10] Remove explicit `include_role` (NO_JIRA) --- tasks/Darwin.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/tasks/Darwin.yml b/tasks/Darwin.yml index 4982d67..ac17f4b 100644 --- a/tasks/Darwin.yml +++ b/tasks/Darwin.yml @@ -16,22 +16,6 @@ changed_when: false become: true -- name: Install Homebrew + kcpassword - ansible.builtin.include_role: - name: geerlingguy.mac.homebrew - vars: - # This is overwritten by our group_vars (cpp.build-machines) - homebrew_taps: - - name: xfreebird/utils - homebrew_installed_packages: - - xfreebird/utils/kcpassword - -# - name: Add kcpassword utility for autologin -# community.general.homebrew: -# name: kcpassword -# state: present -# become: true - - name: Set autoLoginUser for current user community.general.osx_defaults: domain: /Library/Preferences/com.apple.loginwindow From 7e72d4d715e382c0d58baa928629d6e7ae9f760d Mon Sep 17 00:00:00 2001 From: Florian Piesche <79453505+florianpiesche@users.noreply.github.com> Date: Tue, 20 Aug 2024 18:31:50 +0100 Subject: [PATCH 05/10] Add homebrew vars to role dependency (NO_JIRA) --- meta/main.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/main.yml b/meta/main.yml index 6993c84..1205975 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -39,3 +39,10 @@ galaxy_info: dependencies: - role: ccdc.package_manager_configuration - role: geerlingguy.mac.homebrew + vars: + # This is overwritten by our group_vars (cpp.build-machines) + homebrew_taps: + - name: xfreebird/utils + homebrew_installed_packages: + - xfreebird/utils/kcpassword + From a6f81c41d5c492eaa87fce5529e97561c6a013cc Mon Sep 17 00:00:00 2001 From: Florian Piesche <79453505+florianpiesche@users.noreply.github.com> Date: Tue, 20 Aug 2024 19:11:21 +0100 Subject: [PATCH 06/10] Revert Homebrew role dependency (NO_JIRA) Role dependencies cannot be platform-specific and `geerlingguy.mac.homebrew` doesn't check its host platform. :( --- meta/main.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index 1205975..e7b78cd 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -38,11 +38,3 @@ galaxy_info: dependencies: - role: ccdc.package_manager_configuration - - role: geerlingguy.mac.homebrew - vars: - # This is overwritten by our group_vars (cpp.build-machines) - homebrew_taps: - - name: xfreebird/utils - homebrew_installed_packages: - - xfreebird/utils/kcpassword - From d220c3957a7e95a0e8056fb2538bd90f89e3b8b8 Mon Sep 17 00:00:00 2001 From: Florian Piesche <79453505+florianpiesche@users.noreply.github.com> Date: Tue, 20 Aug 2024 19:12:20 +0100 Subject: [PATCH 07/10] Reinstate explicit include_role for `geerlingguy.mac.homebrew` (NO_JIRA) We cannot otherwise make this conditional on running on macOS only. --- tasks/Darwin.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tasks/Darwin.yml b/tasks/Darwin.yml index ac17f4b..409fab5 100644 --- a/tasks/Darwin.yml +++ b/tasks/Darwin.yml @@ -16,6 +16,16 @@ changed_when: false become: true +- name: Install Homebrew + kcpassword + ansible.builtin.include_role: + name: geerlingguy.mac.homebrew + vars: + # This is overwritten by our group_vars (cpp.build-machines) + homebrew_taps: + - name: xfreebird/utils + homebrew_installed_packages: + - xfreebird/utils/kcpassword + - name: Set autoLoginUser for current user community.general.osx_defaults: domain: /Library/Preferences/com.apple.loginwindow From 01c9623ff0386dfb28dd22860235c55590d9d8f2 Mon Sep 17 00:00:00 2001 From: Florian Piesche <79453505+florianpiesche@users.noreply.github.com> Date: Mon, 16 Sep 2024 15:31:26 +0100 Subject: [PATCH 08/10] Fix linter complaint (NO_JIRA) --- vars/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/macos.yml b/vars/macos.yml index 455d9ff..7a2ef84 100644 --- a/vars/macos.yml +++ b/vars/macos.yml @@ -6,7 +6,7 @@ homebrew_user: "{{ ansible_user }}" homebrew_taps: - name: xfreebird/utils - name: xcodesorg/made -current_user: "{{ lookup('env','USER') }}" +current_user: "{{ lookup('env', 'USER') }}" homebrew_installed_packages: - kcpassword From 4ed66a39376ab7d664d6d3072178291d47b45412 Mon Sep 17 00:00:00 2001 From: Florian Piesche <79453505+florianpiesche@users.noreply.github.com> Date: Mon, 16 Sep 2024 15:35:04 +0100 Subject: [PATCH 09/10] Fix linter complaints (NO_JIRA) --- tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index f4ad968..7fde4c8 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,5 +1,5 @@ --- -- name: Set OS-specific variables for {{ ansible_os_family }}-{{ ansible_distribution }}-{{ ansible_distribution_major_version }} +- name: Set OS-specific variables for {{ ansible_os_family }}-{{ ansible_distribution }}-{{ ansible_distribution_major_version }} # noqa: name[template] ansible.builtin.include_vars: "{{ item }}" with_first_found: - files: @@ -11,7 +11,7 @@ skip: true tags: vars -- name: Set up desktop environment on {{ ansible_os_family }}-{{ ansible_distribution }}-{{ ansible_distribution_major_version }} +- name: Set up desktop environment on {{ ansible_os_family }}-{{ ansible_distribution }}-{{ ansible_distribution_major_version }} # noqa: name[template] ansible.builtin.include_tasks: "{{ item }}" with_first_found: - files: From 5504170d638074eeaa8ba78c7495be5889bd846a Mon Sep 17 00:00:00 2001 From: Florian Piesche <79453505+florianpiesche@users.noreply.github.com> Date: Mon, 16 Sep 2024 15:36:02 +0100 Subject: [PATCH 10/10] Fix linter complaints (NO_JIRA) --- tasks/Windows.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tasks/Windows.yml b/tasks/Windows.yml index 7895634..5ba30e6 100644 --- a/tasks/Windows.yml +++ b/tasks/Windows.yml @@ -6,10 +6,18 @@ become: true - name: Enable autologon for vagrant - ansible.windows.win_command: powershell.exe Start-Process -FilePath "C:\\ProgramData\\chocolatey\\bin\\Autologon.exe" -ArgumentList '"/accepteula" vagrant . {{ windows_autologon_password }}' + ansible.windows.win_command: > + powershell.exe Start-Process + -FilePath "C:\\ProgramData\\chocolatey\\bin\\Autologon.exe" + -ArgumentList '"/accepteula" vagrant . {{ windows_autologon_password }}' - name: Disable screen saver - ansible.windows.win_shell: Set-ItemProperty "HKCU:\Control Panel\Desktop" -Name ScreenSaveActive -Value 0 -Type DWord + ansible.windows.win_shell: > + Set-ItemProperty + "HKCU:\Control Panel\Desktop" + -Name ScreenSaveActive + -Value 0 + -Type DWord - name: Disable monitor and standby idle timeout ansible.windows.win_command: powercfg -x -{{ timeout }} 0