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

UYUNI MASTER - REFENV - rename module names and remove configurations to use cucumber testsuite default values #1474

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ node('sumaform-cucumber') {
string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/Uyuni-Master-refenv-NUE.tf', description: 'Path to the tf file to be used'),
string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
string(name: 'sumaform_ref', defaultValue: 'rename_cucumber_testsuite_module', description: 'Sumaform Git reference (branch, tag...)'),
choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
choice(name: 'terraform_bin', choices: ['/usr/bin/terraform'], description: 'Terraform binary path'),
choice(name: 'terraform_bin_plugins', choices: ['/usr/bin'], description: 'Terraform plugins path'),
Expand Down
33 changes: 7 additions & 26 deletions terracumber_config/tf_files/Uyuni-Master-refenv-NUE.tf
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ module "cucumber_testsuite" {
images = ["rocky8o", "opensuse155o", "leapmicro55o", "ubuntu2204o", "sles15sp4o"]

use_avahi = false
name_prefix = "uyuni-refmaster-"
name_prefix = "uyuni-ref-master-"
domain = "mgr.suse.de"
from_email = "[email protected]"

Expand Down Expand Up @@ -154,78 +154,59 @@ module "cucumber_testsuite" {
memory = 2048
}
main_disk_size = 200
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
runtime = "podman"
container_repository = "registry.opensuse.org/systemsmanagement/uyuni/master/containers"
container_tag = "latest"
}
suse-minion = {
suse_minion = {
image = "opensuse155o"
name = "min-suse"
provider_settings = {
mac = "aa:b2:93:01:00:e6"
vcpu = 2
memory = 2048
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
suse-sshminion = {
suse_sshminion = {
image = "opensuse155o"
name = "minssh-suse"
provider_settings = {
mac = "aa:b2:93:01:00:e8"
vcpu = 2
memory = 2048
}
additional_packages = [ "venv-salt-minion", "iptables" ]
install_salt_bundle = true
}
redhat-minion = {
rhlike_minion = {
image = "rocky8o"
name = "min-rocky8"
provider_settings = {
mac = "aa:b2:93:01:00:e9"
// Since start of May we have problems with the instance not booting after a restart if there is only a CPU and only 1024Mb for RAM
// Also, openscap cannot run with less than 1.25 GB of RAM
vcpu = 2
memory = 2048
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
debian-minion = {
deblike_minion = {
image = "ubuntu2204o"
name = "min-ubuntu2204"
provider_settings = {
mac = "aa:b2:93:01:00:eb"
vcpu = 2
memory = 2048
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
build-host = {
build_host = {
image = "sles15sp4o"
provider_settings = {
mac = "aa:b2:93:01:00:ed"
vcpu = 2
memory = 2048
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
kvm-host = {
kvm_host = {
image = "opensuse155o"
name = "min-kvm"
provider_settings = {
mac = "aa:b2:93:01:00:ee"
vcpu = 2
memory = 2048
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
}
provider_settings = {
Expand Down
Loading