Skip to content

Fix bugs in OpenStack tests #984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mbuechse merged 3 commits into from
Sep 10, 2025
Merged

Fix bugs in OpenStack tests #984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7373c55
Fix bug: allow capi image w/recent Ubuntu
mbuechse Sep 9, 2025
f9dda05
Fix bug: work around missing method in boto3
mbuechse Sep 9, 2025
54d3c9a
Fix bug: ABORT result gets redacted
mbuechse Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Tests/iaas/scs_0104_standard_images/standard_images.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
8 changes: 7 additions & 1 deletion Tests/iaas/scs_0123_mandatory_services/mandatory_services.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion compliance-monitor/monitor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading