fix lustre build for 2.15.5 release candidate

Author: sjpb

ansible/roles/lustre/defaults/main.yml

@@ -1,5 +1,4 @@
-
-lustre_version: 'b2_15' # TODO: FIXME to 2.15.5 on release see http://lists.lustre.org/pipermail/lustre-discuss-lustre.org/2024-June/019163.html
+lustre_version: '2.15.5-RC3' # TODO: FIXME to 2.15.5 on release see http://lists.lustre.org/pipermail/lustre-discuss-lustre.org/2024-June/019163.html
 lustre_mounts: [{}] # Ensures if all top-level vars are provided then this isn't required
 #lustre_mgs_nid:
 #lustre_fs_name:
@@ -32,6 +31,6 @@ lustre_configure_opts:
   - --disable-gss-keyring
   - --enable-mpitests=no
 lustre_rpm_globs: # NB: order is important here, as not installing from a repo
-  - "kmod-lustre-client-{{ lustre_version }}-*"
-  - "lustre-client-{{ lustre_version }}-*"
+  - "kmod-lustre-client-{{ lustre_version | split('.') | first }}*" # only take part of the version as -RC versions produce _RC rpms
+  - "lustre-client-{{ lustre_version | split('.') | first }}*"
 lustre_cleanup_build: true

ansible/roles/lustre/tasks/install.yml

@@ -11,7 +11,7 @@
 
 - name: Prepare for lustre configuration
   ansible.builtin.command:
-    cmd: ./autogen.sh
+    cmd: sh ./autogen.sh
     chdir: "{{ lustre_build_dir }}"
 
 - name: Configure lustre build
@@ -43,11 +43,24 @@
 
 - block:
   - name: Remove lustre build prerequisites
-    # NB only remove ones this role installed!
+    # NB Only remove ones this role installed which weren't upgrades
     ansible.builtin.dnf:
-      name: "{{ item | regex_replace('Installed: ', '') }}"
+      name: "{{ _new_pkgs }}"
       state: absent
-    loop: "{{ _lustre_dnf_build_packages.results }}"
+    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: