removed faulty cleanup and added lustre to extrabuild test

Author: wtripp180901

.github/workflows/extra.yml

@@ -8,12 +8,14 @@ on:
       - 'environments/.stackhpc/terraform/cluster_image.auto.tfvars.json'
       - 'ansible/roles/doca/**'
       - 'ansible/roles/cuda/**'
+      - 'ansible/roles/lustre/**'
       - '.github/workflows/extra.yml'
   pull_request:
     paths:
       - 'environments/.stackhpc/terraform/cluster_image.auto.tfvars.json'
       - 'ansible/roles/doca/**'
       - 'ansible/roles/cuda/**'
+      - 'ansible/roles/lustre/**'
       - '.github/workflows/extra.yml'
 
 jobs:
@@ -29,11 +31,11 @@ jobs:
         build:
           - image_name: openhpc-extra-RL8
             source_image_name_key: RL8 # key into environments/.stackhpc/terraform/cluster_image.auto.tfvars.json
-            inventory_groups: doca,cuda
+            inventory_groups: doca,cuda,lustre
             volume_size: 30 # needed for cuda
           - image_name: openhpc-extra-RL9
             source_image_name_key: RL9
-            inventory_groups: doca,cuda
+            inventory_groups: doca,cuda,lustre
             volume_size: 30 # needed for cuda
     env:
       ANSIBLE_FORCE_COLOR: True

ansible/roles/lustre/tasks/install.yml

@@ -41,30 +41,9 @@
   ansible.builtin.dnf:
     name: "{{ _lustre_find_rpms.files | map(attribute='path')}}"
     disable_gpg_check: yes
-  
-- block:
-  - name: Remove lustre build prerequisites
-    # NB Only remove ones this role installed which weren't upgrades
-    ansible.builtin.dnf:
-      name: "{{ _new_pkgs }}"
-      state: absent
-    vars:
-      _installed_pkgs: |
-        {{
-          _lustre_dnf_build_packages.results |
-          select('match', 'Installed:') |
-          map('regex_replace', '^Installed: (.+?)-[0-9].*$', '\1')
-        }}
-      _removed_pkgs: |
-        {{
-          _lustre_dnf_build_packages.results |
-          select('match', 'Removed:') |
-          map('regex_replace', '^Removed: (.+?)-[0-9].*$', '\1')
-        }}
-      _new_pkgs: "{{ _installed_pkgs | difference(_removed_pkgs) }}"
-  
-  - name: Delete lustre build dir
-    file:
-      path: "{{ lustre_build_dir }}"
-      state: absent
+
+- name: Delete lustre build dir
+  file:
+    path: "{{ lustre_build_dir }}"
+    state: absent
   when: lustre_build_cleanup | bool