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

Add support for SL Micro 6.1 hosts #1771

Merged
merged 6 commits into from
Jan 22, 2025
Merged

Conversation

szachovy
Copy link
Contributor

@szachovy szachovy commented Jan 16, 2025

What does this PR change?

This is the continuation of aadfe2e to make it more aligned with #1583 fulfilling requirements in https://github.com/SUSE/spacewalk/issues/26216.

To be verified after deployment:

  • salt/default/sshd.sls
  • ...

@szachovy szachovy requested a review from a team as a code owner January 16, 2025 12:52
@szachovy szachovy self-assigned this Jan 16, 2025
srbarrios
srbarrios previously approved these changes Jan 16, 2025
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

slemicro61o is not supported by user_data.yaml but combustion. Those changes need to be impacted in combustion (if needed).

combustion_images = ["leapmicro55o", "slmicro60o", "slmicro61o"]

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Double check if what is already in combustion is not enough.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like with combustion, changes for transactional systems in user_data.yaml applies the same changes for the second time (?)

fix done

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it's the case, something wrong in sumaform.
In sumaform logic we clearly disable user_data when using combustion

cloud_init = length(regexall("o$", var.image)) > 0 && !contains(local.combustion_images, var.image)

count = local.cloud_init ? var.quantity : 0

modules/controller/variables.tf Outdated Show resolved Hide resolved
modules/cucumber_testsuite/main.tf Outdated Show resolved Hide resolved
modules/cucumber_testsuite/main.tf Outdated Show resolved Hide resolved
salt/repos/testsuite.sls Show resolved Hide resolved
@srbarrios srbarrios dismissed their stale review January 17, 2025 05:48

I overlooked some good points that Maxime caught.

Copy link
Contributor

@maximenoel8 maximenoel8 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the work !

@szachovy szachovy merged commit fb0c89b into master Jan 22, 2025
2 checks passed
@szachovy szachovy deleted the slmicro-61-testsuite-integration branch January 22, 2025 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants