[cifmw_backup_restore] Skip Swift tests when Swift is not enabled and cleanup namespace filters

The e2e flow unconditionally ran Swift data upload/verify steps
even when Swift was not deployed, causing failures on non-Swift
environments. Query `.spec.swift.enabled` from the
`OpenStackControlPlane` CR before attempting Swift operations
and skip gracefully when Swift is absent.

Also remove unnecessary `namespaces` filter from resource modifier
rules and `includedNamespaces` from Swift xattr backup hook — the
backup already scopes to the openstack namespace via labelSelector
and omitting the filter makes rules apply to all matching resources.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Martin Schuppert <mschuppert@redhat.com>

Author: 2 people

roles/cifmw_backup_restore/tasks/e2e.yml

@@ -78,9 +78,34 @@
 # ========================================
 # Step 2.5: Upload Swift test data
 # ========================================
-- name: Upload Swift test data before backup
-  ansible.builtin.include_tasks: swift_data_upload.yml
+- name: Detect Swift and upload test data
   when: cifmw_backup_restore_test_swift_data | bool
+  block:
+    - name: Check if Swift is enabled in the control plane
+      ansible.builtin.shell: |
+        set -o pipefail
+        oc get openstackcontrolplane -n {{ cifmw_backup_restore_namespace }} \
+          -o jsonpath='{.items[0].spec.swift.enabled}'
+      register: _swift_enabled_result
+      changed_when: false
+      failed_when: false
+
+    - name: Set Swift availability fact
+      ansible.builtin.set_fact:
+        _cifmw_backup_restore_swift_available: >-
+          {{ (_swift_enabled_result.rc == 0) and
+             (_swift_enabled_result.stdout | default('false') | bool) }}
+
+    - name: Skip Swift tests — Swift is not enabled
+      ansible.builtin.debug:
+        msg: >-
+          Swift is not enabled in the OpenStackControlPlane CR.
+          Skipping Swift data upload/verify steps.
+      when: not (_cifmw_backup_restore_swift_available | bool)
+
+    - name: Upload Swift test data before backup
+      ansible.builtin.include_tasks: swift_data_upload.yml
+      when: _cifmw_backup_restore_swift_available | bool
 
 # ========================================
 # Step 3: Create backup
@@ -275,6 +300,7 @@
   ansible.builtin.include_tasks: swift_data_verify.yml
   when:
     - cifmw_backup_restore_test_swift_data | bool
+    - _cifmw_backup_restore_swift_available | default(false) | bool
     - cifmw_backup_restore_run_restore | bool
 
 # ========================================

roles/cifmw_backup_restore/templates/00-resource-modifiers-configmap.yaml.j2

@@ -11,8 +11,6 @@ data:
     resourceModifierRules:
     - conditions:
         groupResource: "*"
-        namespaces:
-        - {{ cifmw_backup_restore_namespace }}
       mergePatches:
       - patchData: |
           metadata:
@@ -21,8 +19,6 @@ data:
               kubectl.kubernetes.io/last-applied-configuration: null
     - conditions:
         groupResource: openstackcontrolplanes.core.openstack.org
-        namespaces:
-        - {{ cifmw_backup_restore_namespace }}
       mergePatches:
       - patchData: |
           metadata:
@@ -31,8 +27,6 @@ data:
               core.openstack.org/deployment-stage: "infrastructure-only"
     - conditions:
         groupResource: instancehas.instanceha.openstack.org
-        namespaces:
-        - {{ cifmw_backup_restore_namespace }}
       mergePatches:
       - patchData: |
           spec:

roles/cifmw_backup_restore/templates/backup-pvcs.yaml.j2

@@ -27,8 +27,6 @@ spec:
   hooks:
     resources:
       - name: swift-xattr-backup
-        includedNamespaces:
-          - {{ cifmw_backup_restore_namespace }}
         labelSelector:
           matchLabels:
             component: swift-storage