Skip to content

Commit

Permalink
SUMA HEAD - rename module names and remove configurations to use cucu…
Browse files Browse the repository at this point in the history
…mber testsuite default values (#1468)
  • Loading branch information
maximenoel8 authored Nov 25, 2024
1 parent 4e25b1e commit 063d550
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 29 deletions.
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/SUSEManager-Head-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
36 changes: 8 additions & 28 deletions terracumber_config/tf_files/SUSEManager-Head-NUE.tf
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ module "cucumber_testsuite" {
images = ["rocky8o", "opensuse155o", "ubuntu2204o", "sles15sp4o", "slemicro55o"]

use_avahi = false
name_prefix = "suma-head-"
name_prefix = "suma-ci-head-"
domain = "mgr.suse.de"
from_email = "[email protected]"

Expand Down Expand Up @@ -154,70 +154,53 @@ module "cucumber_testsuite" {
memory = 2048
}
main_disk_size = 200
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
runtime = "podman"
container_repository = "registry.suse.de/devel/galaxy/manager/head/containerfile"
container_tag = "latest"
}
suse-minion = {
suse_minion = {
image = "sles15sp4o"
name = "min-sles15"
provider_settings = {
mac = "aa:b2:93:01:00:b6"
vcpu = 2
memory = 2048
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
suse-sshminion = {
suse_sshminion = {
image = "sles15sp4o"
name = "minssh-sles15"
provider_settings = {
mac = "aa:b2:93:01:00:b8"
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:b9"
// 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:bb"
vcpu = 2
memory = 2048
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
build-host = {
build_host = {
image = "sles15sp4o"
name = "min-build"
provider_settings = {
mac = "aa:b2:93:01:00:bd"
vcpu = 2
memory = 2048
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
pxeboot-minion = {
pxeboot_minion = {
image = "sles15sp4o"
}
dhcp-dns = {
Expand All @@ -229,16 +212,13 @@ module "cucumber_testsuite" {
private_key = file("~/.ssh/id_rsa")
}
}
kvm-host = {
kvm_host = {
image = "sles15sp4o"
name = "min-kvm"
provider_settings = {
mac = "aa:b2:93:01:00:be"
vcpu = 4
memory = 4096
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
}

Expand Down

0 comments on commit 063d550

Please sign in to comment.