Skip to content

Commit

Permalink
test(aws): include deprecated aws pro fips images (CPC-3030)
Browse files Browse the repository at this point in the history
There are instances where all AWS PRO FIPS marketplace images are
deprecated for a given series and pycloudlib was not able to locate them.

Bump pycloudlib to 1!5.6.0 and instruct it to include deprecated in that
lookup.
  • Loading branch information
aciba90 authored and orndorffgrant committed Oct 6, 2023
1 parent f4591af commit fd05d80
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
12 changes: 10 additions & 2 deletions features/cloud.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,18 +193,26 @@ def locate_image_name(
)

image_type = ImageType.GENERIC
include_deprecated = False
if "pro-fips" in machine_type:
image_type = ImageType.PRO_FIPS
include_deprecated = True
elif "pro" in machine_type:
image_type = ImageType.PRO

if daily:
logging.debug("looking up daily image for {}".format(series))
return self.api.daily_image(release=series, image_type=image_type)
return self.api.daily_image(
release=series,
image_type=image_type,
include_deprecated=include_deprecated,
)
else:
logging.debug("looking up released image for {}".format(series))
return self.api.released_image(
release=series, image_type=image_type
release=series,
image_type=image_type,
include_deprecated=include_deprecated,
)

def manage_ssh_key(
Expand Down
2 changes: 1 addition & 1 deletion integration-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
behave
jsonschema
PyHamcrest
pycloudlib==1!5.0.0
pycloudlib==1!5.6.0
toml==0.10

ipdb
Expand Down

0 comments on commit fd05d80

Please sign in to comment.