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

SUMA 4.3 - REFENV - rename module names and remove configurations to use cucumber testsuite default values #1475

Merged
merged 3 commits into from
Nov 26, 2024
Merged

SUMA 4.3 - REFENV - rename module names and remove configurations to use cucumber testsuite default values #1475

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
6ddeab5
Update suse manager 4.3 refenv PRV
maximenoel8 Nov 25, 2024
65fe452
Update suse manager 4.3 refenv NUE
maximenoel8 Nov 26, 2024
731c031
Point to cucumber module refactor temporary branch
maximenoel8 Nov 26, 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
2 changes: 1 addition & 1 deletion jenkins_pipelines/environments/manager-4.3-infra-reference-NUE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ node('sumaform-cucumber') {
string(name: 'cucumber_gitrepo', defaultValue: 'https://github.com/SUSE/spacewalk.git', description: 'Testsuite Git Repository'),
string(name: 'cucumber_ref', defaultValue: 'Manager-4.3', description: 'Testsuite Git reference (branch, tag...)'),
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
2 changes: 1 addition & 1 deletion jenkins_pipelines/environments/manager-4.3-infra-reference-PRV
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ node('sumaform-cucumber-provo') {
parameters([
string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/SUSEManager-4.3-refenv-PRV.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/SUSEManager-4.3-refenv-NUE.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ module "cucumber_testsuite" {
images = ["centos7o", "opensuse155o", "sles15sp4o", "ubuntu2204o"]

use_avahi = false
name_prefix = "suma-ref43-"
name_prefix = "suma-ref-43-"
domain = "mgr.suse.de"
from_email = "[email protected]"

Expand Down Expand Up @@ -145,75 +145,56 @@ module "cucumber_testsuite" {
vcpu = 2
memory = 2048
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
suse-minion = {
suse_minion = {
image = "sles15sp4o"
name = "min-sles15"
provider_settings = {
mac = "aa:b2:93:01:00:a6"
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:a8"
vcpu = 2
memory = 2048
}
additional_packages = [ "venv-salt-minion", "iptables" ]
install_salt_bundle = true
}
redhat-minion = {
rhlike_minion = {
image = "centos7o"
name = "min-centos7"
provider_settings = {
mac = "aa:b2:93:01:00:a9"
// 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:ab"
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:ad"
vcpu = 2
memory = 2048
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
kvm-host = {
kvm_host = {
image = "sles15sp4o"
name = "min-kvm"
provider_settings = {
mac = "aa:b2:93:01:00:ae"
vcpu = 2
memory = 2048
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
}
provider_settings = {
Expand Down
78 changes: 29 additions & 49 deletions terracumber_config/tf_files/SUSEManager-4.3-refenv-PRV.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,13 @@ module "base" {
cc_username = var.SCC_USER
cc_password = var.SCC_PASSWORD

name_prefix = "suma-ref43-"
name_prefix = "suma-ref-43-"
use_avahi = false
domain = "mgr.prv.suse.net"
images = ["centos7o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "ubuntu2204o"]
mirror = "minima-mirror-ci-bv.mgr.prv.suse.net"
use_mirror_images = true
product_version = "4.3-nightly"

provider_settings = {
pool = "ssd"
Expand All @@ -104,9 +105,8 @@ module "base" {

module "server" {
source = "./modules/server"
name = "server"
base_configuration = module.base.configuration
product_version = "4.3-nightly"
name = "srv"
monitored = true
use_os_released_updates = true
disable_download_tokens = false
Expand All @@ -119,82 +119,67 @@ module "server" {
}
}

module "suse-client" {
source = "./modules/client"
base_configuration = module.base.configuration
product_version = "4.3-nightly"
name = "cli-sles15"
image = "sles15sp4o"

module "suse_client" {
source = "./modules/client"
base_configuration = module.base.configuration
image = "sles15sp4o"
name = "suse-client"
server_configuration = module.server.configuration
use_os_released_updates = true

provider_settings = {
mac = "aa:b2:92:03:00:96"
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}

module "suse-minion" {
source = "./modules/minion"
base_configuration = module.base.configuration
product_version = "4.3-nightly"
name = "min-sles15"
image = "sles15sp3o" // left with SP3 since we update it to SP4 in the testsuite

module "suse_minion" {
source = "./modules/minion"
base_configuration = module.base.configuration
image = "sles15sp3o" // left with SP3 since we update it to SP4 in the testsuite
name = "suse-minion"
server_configuration = module.server.configuration
use_os_released_updates = true

provider_settings = {
mac = "aa:b2:92:03:00:98"
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}

module "redhat-minion" {
source = "./modules/minion"
base_configuration = module.base.configuration
product_version = "4.3-nightly"
name = "min-centos7"
image = "centos7o"
module "rhlike_minion" {
source = "./modules/minion"
base_configuration = module.base.configuration
image = "centos7o"
name = "rhlike-minion"

server_configuration = module.server.configuration
auto_connect_to_master = false

provider_settings = {
mac = "aa:b2:92:03:00:99"
mac = "aa:b2:92:03:00:9a"
// 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
memory = 2048
vcpu = 2
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}

module "debian-minion" {
source = "./modules/minion"
base_configuration = module.base.configuration
product_version = "4.3-nightly"
name = "min-ubuntu2204"
image = "ubuntu2204o"
server_configuration = module.server.configuration
module "deblike_minion" {
source = "./modules/minion"
base_configuration = module.base.configuration
image = "ubuntu2204o"
name = "deblike-minion"
server_configuration = module.server.configuration

provider_settings = {
mac = "aa:b2:92:03:00:9b"
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}

module "build-host" {
module "build_host" {
source = "./modules/build_host"
base_configuration = module.base.configuration
product_version = "4.3-nightly"
name = "min-build"
image = "sles15sp4o"
name = "build-host"
server_configuration = module.server.configuration

provider_settings = {
Expand All @@ -208,21 +193,16 @@ module "build-host" {
devel_pool_repo = "http://minima-mirror-ci-bv.mgr.prv.suse.net/SUSE/Products/SLE-Module-Development-Tools/15-SP4/x86_64/product/",
devel_updates_repo = "http://minima-mirror-ci-bv.mgr.prv.suse.net/SUSE/Updates/SLE-Module-Development-Tools/15-SP4/x86_64/update/"
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}

module "kvm-minion" {
module "kvm_host" {
source = "./modules/virthost"
base_configuration = module.base.configuration
product_version = "head"
name = "min-kvm"
image = "sles15sp4o"
name = "kvm-host"
server_configuration = module.server.configuration

provider_settings = {
mac = "aa:b2:92:03:00:9e"
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
Loading