Skip to content
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.

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

(CAT-1545) - Return RHEL-9 ARM images in matrix #532

Merged
merged 3 commits into from
Nov 10, 2023

Conversation

jordanbreen28
Copy link
Contributor

@jordanbreen28 jordanbreen28 commented Nov 9, 2023

This PR adds a new constant ARM_IMAGE_TABLE which contains viable arm architecture images in GCP. Now whenever rhel-9 is listed as a supported OS in a modules metadata, both the intel and arm GCP image details are returned.
Have opted for bugfix label as fixes regression in #530. We cannot specify arm explicitly in the metadata.json.

Related Issues (if any)

https://perforce.atlassian.net/browse/CAT-1545

Checklist

  • 🟢 Spec tests.
  • 🟢 Acceptance tests.
  • Manually verified.

Verified with metadata.json containing rhel-9 that both the rhel-9 intel and rhel-9-arm entries are returned:

matrix={"platforms":[{"label":"CentOS-6","provider":"docker","image":"litmusimage/centos:6"},{"label":"RedHat-8","provider":"provision_service","image":"rhel-8"},{"label":"RedHat-9","provider":"provision_service","image":"rhel-9"},{"label":"RedHat-9-arm","provider":"provision_service","image":"rhel-9-arm64"},{"label":"Ubuntu-18.04","provider":"docker","image":"litmusimage/ubuntu:18.04"}],"collection":["puppet7-nightly","puppet8-nightly"]}
spec_matrix={"include":[{"puppet_version":"~> 7.24","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}

@jordanbreen28 jordanbreen28 force-pushed the CAT-1545-add_machine_type_to_matrix branch 5 times, most recently from 9e3a506 to b8d5d80 Compare November 9, 2023 09:45
@jordanbreen28 jordanbreen28 marked this pull request as ready for review November 9, 2023 09:54
@jordanbreen28 jordanbreen28 requested a review from a team as a code owner November 9, 2023 09:54
@jordanbreen28 jordanbreen28 marked this pull request as draft November 9, 2023 17:29
@jordanbreen28 jordanbreen28 force-pushed the CAT-1545-add_machine_type_to_matrix branch 11 times, most recently from a7b2edf to c999966 Compare November 10, 2023 13:53
This commit adds a machine_type field to each object in the matrix
platforms.
This means that for arm-based architectures, we can return the
t2a-standard-2 machine which supports arm.
If not arm based, then resort back to default.
@jordanbreen28 jordanbreen28 force-pushed the CAT-1545-add_machine_type_to_matrix branch from c999966 to 28749bb Compare November 10, 2023 13:54
@jordanbreen28 jordanbreen28 changed the title (CAT-1545) - Add machine type to matrix (CAT-1545) - Return RHEL-9 ARM images in matrix Nov 10, 2023
@jordanbreen28 jordanbreen28 force-pushed the CAT-1545-add_machine_type_to_matrix branch from 28749bb to 4fc60d4 Compare November 10, 2023 14:06
@jordanbreen28 jordanbreen28 marked this pull request as ready for review November 10, 2023 14:09
@GSPatton GSPatton merged commit 159b49b into main Nov 10, 2023
6 checks passed
@GSPatton GSPatton deleted the CAT-1545-add_machine_type_to_matrix branch November 10, 2023 14:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants