Merge pull request #546 from ripleymj/spring2024-cleanup

Spring2024 cleanup
jmunixusers · Feb 7, 2024 · a39b1f4 · a39b1f4 · Jonathing · Feb 12, 2024
2 parents fff9541 + bd54b90
commit a39b1f4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/packer/mint-beta.pkrvars.hcl b/packer/mint-beta.pkrvars.hcl
@@ -1,4 +1,4 @@
-semester = "Fa23"
+semester = "Sp24"
 
 mint_version = {
   version    = "21.3"

diff --git a/packer/variables.pkr.hcl b/packer/variables.pkr.hcl
@@ -53,7 +53,7 @@ variable "headless" {
 
 variable "semester" {
   type    = string
-  default = "Fa23"
+  default = "Sp24"
 }
 
 variable "ssh_pass" {

diff --git a/roles/oem/tasks/vm_only_pre.yml b/roles/oem/tasks/vm_only_pre.yml
@@ -1,9 +1,16 @@
 ---
 
 # Tasks for the oem role to run at the beginning of playbook execution
+- name: Gather the package facts
+  ansible.builtin.package_facts:
+    manager: auto
+- name: Find unneeded backgrounds
+  ansible.builtin.set_fact:
+    obsolete_backgrounds: "{{ ansible_facts.packages | select('search', 'mint-background') | reject('search', ansible_distribution_release) | list }}"
+
 - name: Remove unneeded stock packages
   ansible.builtin.apt:
-    name: '{{ oem_packages_to_remove }}'
+    name: '{{ oem_packages_to_remove + obsolete_backgrounds }}'
     state: absent
     purge: yes
 - name: Remove i386 architecture

diff --git a/roles/oem/vars/main.yml b/roles/oem/vars/main.yml
@@ -62,15 +62,6 @@ oem_packages_to_remove:
   - hyphen-ru
   - libreoffice*
   - mint-artwork-mate
-  - mint-backgrounds-sarah
-  - mint-backgrounds-serena
-  - mint-backgrounds-sonya
-  - mint-backgrounds-tara
-  - mint-backgrounds-tessa
-  - mint-backgrounds-tina
-  - mint-backgrounds-ulyana
-  - mint-backgrounds-ulyssa
-  - mint-backgrounds-vanessa
   - mono-*
   - myspell-*
   - mythes-de