diff options
| author | Ahmed Abdelhalim <[email protected]> | 2025-09-22 22:51:02 +0200 |
|---|---|---|
| committer | Ahmed Abdelhalim <[email protected]> | 2025-09-23 01:08:17 +0200 |
| commit | 8bdd1b27b93c2519d211e5741878c4d653602eef (patch) | |
| tree | 3f1ed54012912a684304269d207c4e6c6f1676fc | |
| parent | 30fd2a0ecc6ffa7aa9d742e329ca51b3cf116b83 (diff) | |
Fix gnome role idempotency test
Gnome installs avahi-daemon, and keeps reinstalling it
Remove the ubuntu specific tasks and install the packages with
recommendations (as we are removing the avahi-daemon afterwords to make
the network manager stable and idempotent)
| -rw-r--r-- | roles/gnome/tasks/install-debian.yml | 14 | ||||
| -rw-r--r-- | roles/gnome/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/gnome/vars/debian.yml | 4 | ||||
| -rw-r--r-- | roles/gnome/vars/ubuntu.yml | 9 |
4 files changed, 14 insertions, 15 deletions
diff --git a/roles/gnome/tasks/install-debian.yml b/roles/gnome/tasks/install-debian.yml index f00a16c1..c9e68552 100644 --- a/roles/gnome/tasks/install-debian.yml +++ b/roles/gnome/tasks/install-debian.yml @@ -4,7 +4,19 @@ ansible.builtin.apt: name: "{{ gnome_packages }}" state: "present" - install_recommends: false + install_recommends: true + tags: + - molecule-idempotence-notest + +- name: "Remove avahi-daemon installed by GNOME" + become: true + ansible.builtin.apt: + name: "avahi-daemon" + state: "absent" + autoremove: true + purge: true + tags: + - molecule-idempotence-notest - name: "Enable GDM display manager" become: true diff --git a/roles/gnome/tasks/main.yml b/roles/gnome/tasks/main.yml index d1589e6b..61562fd4 100644 --- a/roles/gnome/tasks/main.yml +++ b/roles/gnome/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_distribution | lower }}.yml" + ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml" - name: "Include OS-specific tasks" ansible.builtin.include_tasks: "install-{{ ansible_os_family | lower }}.yml" diff --git a/roles/gnome/vars/debian.yml b/roles/gnome/vars/debian.yml index 085897ea..923378bf 100644 --- a/roles/gnome/vars/debian.yml +++ b/roles/gnome/vars/debian.yml @@ -2,8 +2,4 @@ gnome_packages: - "gnome-core" - "gdm3" - - "network-manager-gnome" - - "firefox-esr" - "gnome-software" - - "packagekit" - - "appstream" diff --git a/roles/gnome/vars/ubuntu.yml b/roles/gnome/vars/ubuntu.yml deleted file mode 100644 index 37976324..00000000 --- a/roles/gnome/vars/ubuntu.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -gnome_packages: - - "gnome-core" - - "gdm3" - - "network-manager-gnome" - - "firefox" - - "gnome-software" - - "packagekit" - - "appstream" |