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

Rename uyuni master podman nue modules and hostnames #1464

Merged
merged 3 commits into from
Nov 17, 2024
Merged

Rename uyuni master podman nue modules and hostnames #1464

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
60fa024
Rename module for uyuni master podman
maximenoel8 Nov 12, 2024
cb820ab
Specify additional disk for podman.
maximenoel8 Nov 13, 2024
0cf1836
Salt venv-salt installation ( not needed with new cucumber module)
maximenoel8 Nov 14, 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/uyuni-master-dev-acceptance-tests-podman
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_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/Uyuni-Master-podman.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
101 changes: 40 additions & 61 deletions terracumber_config/tf_files/Uyuni-Master-podman.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,26 +107,26 @@ module "cucumber_testsuite" {
cc_username = var.SCC_USER
cc_password = var.SCC_PASSWORD

images = ["rocky8o", "opensuse155o", "leapmicro55o", "ubuntu2204o", "sles15sp4o"]
images = ["rocky8o", "opensuse155o", "leapmicro55o", "ubuntu2204o", "sles15sp4o"]

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

no_auth_registry = "registry.mgr.suse.de"
auth_registry = "registry.mgr.suse.de:5000/cucutest"
auth_registry_username = "cucutest"
auth_registry_password = "cucusecret"
git_profiles_repo = "https://github.com/uyuni-project/uyuni.git#:testsuite/features/profiles/internal_nue"
no_auth_registry = "registry.mgr.suse.de"
auth_registry = "registry.mgr.suse.de:5000/cucutest"
auth_registry_username = "cucutest"
auth_registry_password = "cucusecret"
git_profiles_repo = "https://github.com/uyuni-project/uyuni.git#:testsuite/features/profiles/internal_nue"

container_server = true
container_proxy = true
container_server = true
container_proxy = true

mirror = "minima-mirror-ci-bv.mgr.suse.de"
use_mirror_images = true

server_http_proxy = "http-proxy.mgr.suse.de:3128"
server_http_proxy = "http-proxy.mgr.suse.de:3128"
custom_download_endpoint = "ftp://minima-mirror-ci-bv.mgr.suse.de:445"

# when changing images, please also keep in mind to adjust the image matrix at the end of the README.
Expand All @@ -141,98 +141,77 @@ module "cucumber_testsuite" {
mac = "aa:b2:93:01:00:21"
memory = 16384
}
runtime = "podman"
container_repository = "registry.opensuse.org/systemsmanagement/uyuni/master/containers"
container_tag = "latest"
helm_chart_url = "oci://registry.opensuse.org/systemsmanagement/uyuni/master/charts/uyuni/server"
login_timeout = 28800
runtime = "podman"
container_repository = "registry.opensuse.org/systemsmanagement/uyuni/master/containers"
container_tag = "latest"
helm_chart_url = "oci://registry.opensuse.org/systemsmanagement/uyuni/master/charts/uyuni/server"
main_disk_size = 50
repository_disk_size = 150
database_disk_size = 50
login_timeout = 28800
}
proxy_containerized = {
provider_settings = {
mac = "aa:b2:93:01:00:22"
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
runtime = "podman"
container_repository = "registry.opensuse.org/systemsmanagement/uyuni/master/containers"
container_tag = "latest"
runtime = "podman"
container_repository = "registry.opensuse.org/systemsmanagement/uyuni/master/containers"
container_tag = "latest"
}
suse-minion = {
image = "opensuse155o"
name = "min-suse"
suse_minion = {
image = "opensuse155o"
provider_settings = {
mac = "aa:b2:93:01:00:26"
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
suse-sshminion = {
image = "opensuse155o"
name = "minssh-suse"
suse_sshminion = {
image = "opensuse155o"
provider_settings = {
mac = "aa:b2:93:01:00:28"
}
additional_packages = [ "venv-salt-minion", "iptables" ]
install_salt_bundle = true
}
redhat-minion = {
image = "rocky8o"
name = "min-rocky8"
rhlike_minion = {
image = "rocky8o"
provider_settings = {
mac = "aa:b2:93:01:00:2a"
// 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 = {
image = "ubuntu2204o"
name = "min-ubuntu2204"
deblike_minion = {
image = "ubuntu2204o"
provider_settings = {
mac = "aa:b2:93:01:00:2b"
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
build-host = {
image = "sles15sp4o"
name = "min-build"
build_host = {
image = "sles15sp4o"
provider_settings = {
mac = "aa:b2:93:01:00:2d"
memory = 2048
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
pxeboot-minion = {
pxeboot_minion = {
image = "sles15sp4o"
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
dhcp-dns = {
name = "dhcp-dns"
image = "opensuse155o"
dhcp_dns = {
name = "dhcp-dns"
image = "opensuse155o"
hypervisor = {
host = "suma-01.mgr.suse.de"
user = "root"
private_key = file("~/.ssh/id_rsa")
}
}
kvm-host = {
image = "opensuse155o"
name = "min-kvm"

kvm_host = {
image = "opensuse155o"
provider_settings = {
mac = "aa:b2:93:01:00:2e"
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
}

provider_settings = {
pool = "ssd"
network_name = null
Expand Down
Loading