Skip to content
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
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ image for testing Pull Requests built with the open build service. This needs to

| | PR test | Uyuni | HEAD | 5.1 | 5.0 | 4.3 |
|-------------|---------------|---------------|--------------|--------------|---------------|--------------|
| Minion | Leap 15.6 | Leap 15.6 | SLES 15 SP4 | SLES 15 SP4 | SLES 15 SP4 | SLES 15 SP4 |
| SSH minion | Leap 15.6 | Leap 15.6 | SLES 15 SP4 | SLES 15 SP4 | SLES 15 SP4 | SLES 15 SP4 |
| Minion | Tumbleweed | Tumbleweed | SLES 15 SP4 | SLES 15 SP4 | SLES 15 SP4 | SLES 15 SP4 |
| SSH minion | Tumbleweed | Tumbleweed | SLES 15 SP4 | SLES 15 SP4 | SLES 15 SP4 | SLES 15 SP4 |
| Client | - | - | - | - | - | SLES 15 SP4 |
| RH-like | Rocky 8 | Rocky 8 | Rocky 8 | Rocky 8 | Rocky 8 | Rocky 8 |
| Deb-like | Ubuntu 24.04 | Ubuntu 24.04 | Ubuntu 24.04 | Ubuntu 24.04 | Ubuntu 24.04 | Ubuntu 22.04 |
Expand All @@ -67,5 +67,5 @@ image for testing Pull Requests built with the open build service. This needs to
| Terminal | SLES 15 SP4 | SLES 15 SP4 | SLES 15 SP4 | SLES 15 SP4 | SLES 15 SP4 | SLES 15 SP4 |
| DHCP-DNS | Leap 15.5 | Leap 15.5 | Leap 15.5 | Leap 15.5 | Leap 15.5 | - |
| Controller | Leap 15.6 | Leap 15.6 | Leap 15.6 | Leap 15.6 | Leap 15.6 | Leap 15.6 |
| Server | Leap 15.6 | Leap Micro 5.5| SL Micro 6.1 | SL Micro 6.1 | SLE Micro 5.5 | SLES 15 SP4 |
| Proxy | Leap 15.6 | Leap Micro 5.5| SL Micro 6.1 | SL Micro 6.1 | SLE Micro 5.5 | SLES 15 SP4 |
| Server | Tumbleweed | Tumbleweed | SL Micro 6.1 | SL Micro 6.1 | SLE Micro 5.5 | SLES 15 SP4 |
| Proxy | Tumbleweed | Tumbleweed | SL Micro 6.1 | SL Micro 6.1 | SLE Micro 5.5 | SLES 15 SP4 |
12 changes: 3 additions & 9 deletions terracumber_config/tf_files/Uyuni-Master-K3S.tf
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ module "cucumber_testsuite" {
cc_username = var.SCC_USER
cc_password = var.SCC_PASSWORD

images = ["rocky8o", "opensuse155o", "opensuse156o", "leapmicro55o", "ubuntu2404o", "sles15sp4o"]
images = ["rocky8o", "opensuse155o", "opensuse156o", "leapmicro55o", "ubuntu2404o", "sles15sp4o", "tumbleweedo"]

use_avahi = false
name_prefix = "uyuni-ci-master-k3s-"
Expand Down Expand Up @@ -138,9 +138,6 @@ module "cucumber_testsuite" {
runtime = "k3s"
container_repository = "registry.opensuse.org/systemsmanagement/uyuni/master/containerfile"
container_tag = "latest"
#cannot use immutable OS, since K3s installation requires a reboot
#also 15.6 had issue on container startup
image = "opensuse156o"

login_timeout = 28800
main_disk_size = 40
Expand All @@ -157,21 +154,18 @@ module "cucumber_testsuite" {
additional_repos = {
containerUtils = "https://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Master:/ContainerUtils/openSUSE_Leap_15.5/"
}
#cannot use immutable OS, since K3s installation requires a reboot
#also 15.6 had issue on container startup
image = "opensuse156o"
container_repository = "registry.opensuse.org/systemsmanagement/uyuni/master/containerfile"
container_tag = "latest"
helm_chart_url = "oci://registry.opensuse.org/systemsmanagement/uyuni/master/charts/uyuni/proxy-helm"
}
suse_minion = {
image = "opensuse156o"
image = "tumbleweedo"
provider_settings = {
mac = "aa:b2:93:01:00:16"
}
}
suse_sshminion = {
image = "opensuse156o"
image = "tumbleweedo"
provider_settings = {
mac = "aa:b2:93:01:00:18"
}
Expand Down
4 changes: 2 additions & 2 deletions terracumber_config/tf_files/Uyuni-Master-NUE.tf
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,13 @@ module "cucumber_testsuite" {
container_tag = "latest"
}
suse_minion = {
image = "opensuse156o"
image = "tumbleweedo"
provider_settings = {
mac = "aa:b2:93:01:00:d6"
}
}
suse_sshminion = {
image = "opensuse156o"
image = "tumbleweedo"
provider_settings = {
mac = "aa:b2:93:01:00:d8"
}
Expand Down
4 changes: 2 additions & 2 deletions terracumber_config/tf_files/Uyuni-Master-PRV.tf
Original file line number Diff line number Diff line change
Expand Up @@ -153,15 +153,15 @@ module "cucumber_testsuite" {
container_tag = "latest"
}
suse_minion = {
image = "opensuse156o"
image = "tumbleweedo"
provider_settings = {
mac = "aa:b2:92:03:00:d6"
vcpu = 2
memory = 2048
}
}
suse_sshminion = {
image = "opensuse156o"
image = "tumbleweedo"
provider_settings = {
mac = "aa:b2:92:03:00:d8"
vcpu = 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ module "base_core" {
name_prefix = "uyuni-bv-master-"
use_avahi = false
domain = "mgr.suse.de"
images = [ "sles12sp5o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "sles15sp7o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign", "slemicro54-ign", "slemicro55o", "slmicro60o", "slmicro61o", "almalinux8o", "almalinux9o", "amazonlinux2023o", "centos7o", "libertylinux9o", "oraclelinux9o", "rocky8o", "rocky9o", "ubuntu2004o", "ubuntu2204o", "ubuntu2404o", "debian12o", "opensuse155o", "opensuse156o", "leapmicro55o" ]
images = [ "sles12sp5o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "sles15sp7o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign", "slemicro54-ign", "slemicro55o", "slmicro60o", "slmicro61o", "almalinux8o", "almalinux9o", "amazonlinux2023o", "centos7o", "libertylinux9o", "oraclelinux9o", "rocky8o", "rocky9o", "ubuntu2004o", "ubuntu2204o", "ubuntu2404o", "debian12o", "opensuse155o", "opensuse156o", "leapmicro55o", "tumbleweedo" ]
// disabled: "openeuler2403o"

mirror = "minima-mirror-ci-bv.mgr.suse.de"
Expand Down Expand Up @@ -184,7 +184,7 @@ module "server_containerized" {
source = "./modules/server_containerized"
base_configuration = module.base_core.configuration
name = "server"
image = "leapmicro55o"
image = "tumbleweedo"
provider_settings = {
mac = "aa:b2:93:02:01:a1"
memory = 40960
Expand Down Expand Up @@ -225,6 +225,7 @@ module "proxy_containerized" {
source = "./modules/proxy_containerized"
base_configuration = module.base_core.configuration
name = "proxy"
image = "tumbleweedo"
provider_settings = {
mac = "aa:b2:93:02:01:a2"
memory = 4096
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ module "base_new_sle" {
name_prefix = "uyuni-bv-master-"
use_avahi = false
domain = "mgr.prv.suse.net"
images = [ "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "sles15sp7o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign", "slemicro54-ign", "slemicro55o", "slmicro60o", "slmicro61o" ]
images = [ "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "sles15sp7o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign", "slemicro54-ign", "slemicro55o", "slmicro60o", "slmicro61o", "tumbleweedo" ]

mirror = "minima-mirror-ci-bv.mgr.prv.suse.net"
use_mirror_images = true
Expand Down Expand Up @@ -334,7 +334,7 @@ module "server_containerized" {
source = "./modules/server_containerized"
base_configuration = module.base_core.configuration
name = "server"
image = "leapmicro55o"
image = "tumbleweedo"
provider_settings = {
mac = "aa:b2:93:04:05:6d"
memory = 40960
Expand Down Expand Up @@ -377,6 +377,7 @@ module "proxy_containerized" {
source = "./modules/proxy_containerized"
base_configuration = module.base_retail.configuration
name = "proxy"
image = "tumbleweedo"
provider_settings = {
mac = "aa:b2:93:04:05:6e"
memory = 4096
Expand Down
4 changes: 2 additions & 2 deletions terracumber_config/tf_files/Uyuni-Master-podman.tf
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,13 @@ module "cucumber_testsuite" {
container_tag = "latest"
}
suse_minion = {
image = "opensuse156o"
image = "tumbleweedo"
provider_settings = {
mac = "aa:b2:93:01:00:26"
}
}
suse_sshminion = {
image = "opensuse156o"
image = "tumbleweedo"
provider_settings = {
mac = "aa:b2:93:01:00:28"
}
Expand Down
6 changes: 3 additions & 3 deletions terracumber_config/tf_files/Uyuni-Master-refenv-NUE.tf
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ module "cucumber_testsuite" {
cc_username = var.SCC_USER
cc_password = var.SCC_PASSWORD

images = ["rocky8o", "opensuse155o", "opensuse156o", "leapmicro55o", "ubuntu2404o", "sles15sp4o"]
images = ["rocky8o", "opensuse155o", "opensuse156o", "leapmicro55o", "ubuntu2404o", "sles15sp4o", "tumbleweedo"]

use_avahi = false
name_prefix = "uyuni-ref-master-"
Expand Down Expand Up @@ -161,15 +161,15 @@ module "cucumber_testsuite" {
container_tag = "latest"
}
suse_minion = {
image = "opensuse155o"
image = "tumbleweedo"
provider_settings = {
mac = "aa:b2:93:01:00:e6"
vcpu = 2
memory = 2048
}
}
suse_sshminion = {
image = "opensuse155o"
image = "tumbleweedo"
provider_settings = {
mac = "aa:b2:93:01:00:e8"
vcpu = 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ module "cucumber_testsuite" {
cc_username = var.SCC_USER
cc_password = var.SCC_PASSWORD

images = ["rocky8o", "opensuse155o", "opensuse156o", "leapmicro55o", "ubuntu2404o", "sles15sp4o"]
images = ["rocky8o", "opensuse155o", "opensuse156o", "leapmicro55o", "ubuntu2404o", "sles15sp4o", "tumbleweedo"]

use_avahi = false
name_prefix = "suma-codecov-"
Expand Down Expand Up @@ -173,14 +173,14 @@ module "cucumber_testsuite" {
container_tag = "latest"
}
suse_minion = {
image = "opensuse156o"
image = "tumbleweedo"
provider_settings = {
mac = "aa:b2:92:04:00:f4"
memory = 4096
}
}
suse_sshminion = {
image = "opensuse156o"
image = "tumbleweedo"
provider_settings = {
mac = "aa:b2:92:04:00:f5"
memory = 4096
Expand Down
Loading