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

Update cucumber testsuite module to match new naming #1662

Open
wants to merge 14 commits into
base: master
Choose a base branch
from

Conversation

maximenoel8
Copy link
Contributor

@maximenoel8 maximenoel8 commented Aug 29, 2024

What does this PR change?

Update cucumber testsuite module to match new naming.
New hostname naming:

  • for suse minions :
    • suse-minion
    • suse-sshminion
    • suse-client
    • slemicro-minion
  • for redhat / rocky8 minions:
    • rhlike-minion
    • rhlike-sshminion
  • for debian / ubuntu2204 minions:
    • deblike-minion
    • deblike-sshminion

Module names are the same using an _ instead of -

Also change the default value for install_salt_bundle from false to true (align with module default value). It will remove the need of adding https://github.com/SUSE/susemanager-ci/blob/8ed2e0bcba38461cf5d0e445d75264a3d1a31a51/terracumber_config/tf_files/SUSEManager-4.3-NUE.tf#L204 for all pipelines using cucumber_testsuite module.

Related to: https://github.com/SUSE/spacewalk/issues/25062

Discussion: https://suse.slack.com/archives/C02D134507M/p1731289062684489

@maximenoel8 maximenoel8 marked this pull request as draft August 29, 2024 01:00
@maximenoel8 maximenoel8 self-assigned this Aug 29, 2024
@maximenoel8 maximenoel8 force-pushed the rename_cucumber_testsuite_module branch from 04b5dcf to 3ff930b Compare November 11, 2024 01:02
@maximenoel8 maximenoel8 force-pushed the rename_cucumber_testsuite_module branch from fc72384 to 8b49a41 Compare November 12, 2024 00:52
@maximenoel8 maximenoel8 marked this pull request as ready for review November 12, 2024 21:46
@maximenoel8 maximenoel8 requested a review from a team November 12, 2024 21:46
@maximenoel8 maximenoel8 force-pushed the rename_cucumber_testsuite_module branch 2 times, most recently from 62edc85 to 2f0a300 Compare November 13, 2024 01:38
}
redhat-minion = {
redlike_minion = {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
redlike_minion = {
rhlike_minion = {

@@ -42,7 +42,7 @@ locals {
names = { for host_key in local.hosts :
host_key => lookup(var.host_settings[host_key], "name", null) if var.host_settings[host_key] != null ? contains(keys(var.host_settings[host_key]), "name") : false }
install_salt_bundle = { for host_key in local.hosts :
host_key => lookup(var.host_settings[host_key], "install_salt_bundle", false) if var.host_settings[host_key] != null }
host_key => lookup(var.host_settings[host_key], "install_salt_bundle", true) if var.host_settings[host_key] != null }
Copy link
Member

Choose a reason for hiding this comment

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

Fine with this, not sure if that should be in another PR.
Anyway, let's at least comment it on the description of the PR please.

Comment on lines +471 to +473
client_configuration = contains(local.hosts, "suse_client") ? module.suse_client.configuration : { hostnames = [], ids = [], ipaddrs = [], macaddrs = [], private_macs = [] }
minion_configuration = contains(local.hosts, "suse_minion") ? module.suse_minion.configuration : { hostnames = [], ids = [], ipaddrs = [], macaddrs = [], private_macs = [] }
sshminion_configuration = contains(local.hosts, "suse_sshminion") ? module.suse_sshminion.configuration : { hostnames = [], ids = [], ipaddrs = [], macaddrs = [], private_macs = [] }
slemicro_minion_configuration = contains(local.hosts, "slemicro_minion") ? module.slemicro_minion.configuration : { hostnames = [], ids = [], ipaddrs = [], macaddrs = [], private_macs = [] }
Copy link
Member

Choose a reason for hiding this comment

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

I wonder if for those we want also to rename the configuration variable name, to have something like... suse_minion_configuration for example.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Definitely. I added a todo for that. I was looking at the redhat, debian conf but those confs too. I will need those changes in a separate PR because it also require some changes on controller salt states.

Copy link
Contributor

@NamelessOne91 NamelessOne91 left a comment

Choose a reason for hiding this comment

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

I haven't spotted any more typos or the likes before my eye started crossing 😄

Thanks Maxime.
I think we' may need to update the 4.3 BV and CI feature for the containerized proxy once the host-name change takes place.

@maximenoel8
Copy link
Contributor Author

maximenoel8 commented Nov 14, 2024

I haven't spotted any more typos or the likes before my eye started crossing 😄

Thanks Maxime. I think we' may need to update the 4.3 BV and CI feature for the containerized proxy once the host-name change takes place.

I'm not sure what need to be changes. Don't hesitate to create an issue and assign it to me we the changes you see.

BV will not be impacted by this change because we don't use this module.

@NamelessOne91
Copy link
Contributor

I'm not sure what need to be changes. Don't hesitate to create an issue and assign it to me we the changes you see.

BV will not be impacted by this change because we don't use this module.

https://github.com/SUSE/spacewalk/pull/25809 should take care of this

@maximenoel8 maximenoel8 force-pushed the rename_cucumber_testsuite_module branch from 2f0a300 to eeb821d Compare November 24, 2024 19:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants