Fix bugs in OpenStack tests (#984)

* Fix bug: allow capi image w/recent Ubuntu
* Fix bug: work around missing method in boto3
* Fix bug: ABORT result gets redacted

Signed-off-by: Matthias Büchse <matthias.buechse@alasca.cloud>

Author: mbuechse

Tests/iaas/scs_0104_standard_images/standard_images.py

@@ -10,12 +10,16 @@
 _specs = yaml.safe_load(r"""
 "ubuntu-capi-image-1":
   name_scheme: "ubuntu-capi-image v[0-9]\\.[0-9]+(\\.[0-9]+)?"
-  source: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube
+  source:
+  - https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2404-kube
+  - https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube
 "ubuntu-capi-image-2":
   # this name_scheme uses `-` to separate base name "ubuntu-capi-image" from version
   # latest openstack-image-manager can be told to use `-` by setting `separator: "-"` on the image
   name_scheme: "ubuntu-capi-image-v[0-9]\\.[0-9]+(\\.[0-9]+)?"
-  source: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube
+  source:
+  - https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2404-kube
+  - https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube
 "Ubuntu 24.04":
   source:
   - https://cloud-images.ubuntu.com/releases/noble/

Tests/iaas/scs_0123_mandatory_services/mandatory_services.py

@@ -153,6 +153,12 @@ def compute_scs_0123_swift_s3(conn: openstack.connection.Connection):
     finally:
         # Cleanup created S3 bucket
         if TESTCONTNAME in s3_buckets:
-            s3.delete_bucket(Bucket=TESTCONTNAME)
+            # contrary to Boto docs at
+            # https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/s3/client/delete_bucket.html
+            # , the following fails with
+            # AttributeError: 's3.ServiceResource' object has no attribute 'delete_bucket'. Did you mean: 'create_bucket'?
+            # s3.delete_bucket(Bucket=TESTCONTNAME)
+            # workaround:
+            s3.Bucket(name=TESTCONTNAME).delete()
         # Clean up ec2 cred IF we created one
         remove_leftovers(usable_credentials, conn)

compliance-monitor/monitor.py

@@ -587,7 +587,7 @@ def _redact_report(report):
         return
     for invdata in report['run']['invocations'].values():
         stdout = invdata.get('stdout', [])
-        redacted = [line for line in stdout if line[-4:] in ('PASS', 'FAIL')]
+        redacted = [line for line in stdout if line.rsplit(': ', 1)[-1] in ('PASS', 'ABORT', 'FAIL')]
         if len(redacted) != len(stdout):
             redacted.insert(0, '(the following has been redacted)')
             invdata['stdout'] = redacted