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.

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

Jump to bottom

Rename module pr pipelines #1477

Merged
merged 3 commits into from
Nov 27, 2024
Merged

Rename module pr pipelines #1477

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
81e5fc5
Update PR template with new cucumber testsuite
maximenoel8 Nov 27, 2024
e3347a8
Point to temporary sumaform branch for cucumber module
maximenoel8 Nov 27, 2024
a67c611
Exclude pr tf template from github actions.
maximenoel8 Nov 27, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/sumaform-validation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
pull_request:
paths:
- 'terracumber_config/tf_files/**'
- '!terracumber_config/tf_files/PR-testing-template.tf'

jobs:
validate_sumaform:
Expand Down
2 changes: 1 addition & 1 deletion jenkins_pipelines/environments/uyuni-prs-ci-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ node('pull-request-test-nue') {
additional_repo_url = params.additional_repo_url;
terraform_parallelism = params.terraform_parallelism;
sumaform_gitrepo = "https://github.com/uyuni-project/sumaform.git";
sumaform_ref = "master";
Copy link
Contributor

Choose a reason for hiding this comment

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

are we still on the test branch?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, rename_cucumber_testsuite_module is the branch that has the cucumber testsuite module changes needed for the renaming. I will merge this branch and move the ref back to master once all the renaming is done. The old naming and new naming can't be supported with the same cucumber testsuite module. I need to differentiate as long as we have both naming conventions.

sumaform_ref = "rename_cucumber_testsuite_module";
secondary_exports = ""
cucumber_gitrepo = params.cucumber_gitrepo;
cucumber_ref = params.cucumber_ref;
Expand Down
44 changes: 11 additions & 33 deletions terracumber_config/tf_files/PR-testing-template.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ module "cucumber_testsuite" {
memory = 2048
}
}
dhcp-dns = {
dhcp_dns = {
name = "dhcp-dns"
image = "opensuse155o"
hypervisor = {
Expand Down Expand Up @@ -88,37 +88,29 @@ module "cucumber_testsuite" {
provider_settings = {
mac = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].mac["proxy"]
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
runtime = "podman"
}
suse-minion = {
suse_minion = {
image = var.SUSE_MINION_IMAGE
name = "min-suse"
provider_settings = {
mac = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].mac["suse-minion"]
vcpu = 2
memory = 2048
}
additional_repos = local.additional_repos["suse-minion"]
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
suse-sshminion = {
suse_sshminion = {
image = var.SUSE_MINION_IMAGE
name = "minssh-suse"
provider_settings = {
mac = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].mac["suse-sshminion"]
vcpu = 2
memory = 2048
}
additional_repos = local.additional_repos["suse-minion"]
additional_packages = [ "venv-salt-minion", "iptables" ]
install_salt_bundle = true
additional_packages = [ "iptables" ]
}
redhat-minion = {
rhlike_minion = {
image = var.RHLIKE_MINION_IMAGE
name = "min-rhlike"
provider_settings = {
mac = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].mac["rhlike-minion"]
memory = 2048
Expand All @@ -127,12 +119,9 @@ module "cucumber_testsuite" {
additional_repos = {
client_repo = var.RHLIKE_CLIENT_REPO,
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
debian-minion = {
deblike_minion = {
image = var.DEBLIKE_MINION_IMAGE
name = "min-deblike"
provider_settings = {
mac = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].mac["deblike-minion"]
vcpu = 2
Expand All @@ -141,43 +130,32 @@ module "cucumber_testsuite" {
additional_repos = {
client_repo = var.DEBLIKE_CLIENT_REPO,
}
additional_packages = [ "venv-salt-minion" ]
// FIXME: cloudl-init fails if venv-salt-minion is not avaiable
// We can set "install_salt_bundle = true" as soon as venv-salt-minion is available Uyuni:Stable
install_salt_bundle = true
}
build-host = {
build_host = {
image = "sles15sp4o"
name = "min-build"
provider_settings = {
mac = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].mac["build-host"]
memory = 2048
}
additional_repos = {
tools_update_pr = var.SLE_CLIENT_REPO
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
pxeboot-minion = {
pxeboot_minion = {
image = "sles15sp4o"
additional_repos = {
tools_update_pr = var.SLE_CLIENT_REPO
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
kvm-host = {
kvm_host = {
image = var.IMAGE
name = "min-kvm"


provider_settings = {
mac = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].mac["kvm-host"]
}
additional_repos_only = var.ADDITIONAL_REPOS_ONLY
additional_repos = local.additional_repos["kvm-host"]
additional_packages = [ "venv-salt-minion", "mkisofs" ]
install_salt_bundle = true
additional_packages = [ "mkisofs" ]
}
}

Expand Down