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

Jump to bottom

Add Ubuntu 24.04 on 4.3 #1403

Merged
merged 1 commit into from
Oct 2, 2024
Merged

Add Ubuntu 24.04 on 4.3 #1403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions jenkins_pipelines/scripts/json_generator/maintenance_json_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"alma8_minion": {"/SUSE_Updates_RES_8-CLIENT-TOOLS_x86_64/"},
"ubuntu2004_minion": {"/SUSE_Updates_Ubuntu_20.04-CLIENT-TOOLS_x86_64/"},
"ubuntu2204_minion": {"/SUSE_Updates_Ubuntu_22.04-CLIENT-TOOLS_x86_64/"},
# no Ubuntu 24.04 on 4.3
"ubuntu2404_minion": {"/SUSE_Updates_Ubuntu_24.04-CLIENT-TOOLS_x86_64/"},
"debian11_minion": {"/SUSE_Updates_Debian_11-CLIENT-TOOLS_x86_64/"},
"debian12_minion": {"/SUSE_Updates_Debian_12-CLIENT-TOOLS_x86_64/"},
"opensuse154arm_minion": {"/SUSE_Updates_openSUSE-SLE_15.4/",
Expand Down Expand Up @@ -123,8 +123,7 @@
"alma8_minion": {"/SUSE_Updates_RES_8-CLIENT-TOOLS-BETA_x86_64/"},
"ubuntu2004_minion": {"/SUSE_Updates_Ubuntu_20.04-CLIENT-TOOLS-BETA_x86_64/"},
"ubuntu2204_minion": {"/SUSE_Updates_Ubuntu_22.04-CLIENT-TOOLS-BETA_x86_64/"},
"ubuntu2404_minion": {"/SUSE_Updates_Ubuntu_24.04-CLIENT-TOOLS-BETA_x86_64/",
"/SUSE_Updates_Ubuntu_24.04-CLIENT-TOOLS_x86_64/"},
"ubuntu2404_minion": {"/SUSE_Updates_Ubuntu_24.04-CLIENT-TOOLS-BETA_x86_64/"},
"debian11_minion": {"/SUSE_Updates_Debian_11-CLIENT-TOOLS-BETA_x86_64/"},
"debian12_minion": {"/SUSE_Updates_Debian_12-CLIENT-TOOLS-BETA_x86_64/"},
"opensuse154arm_minion": {"/SUSE_Updates_SLE-Manager-Tools_15-BETA_aarch64/"},
Expand Down
37 changes: 36 additions & 1 deletion terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ module "base_core" {
name_prefix = "suma-bv-43-"
use_avahi = false
domain = "mgr.suse.de"
images = [ "sles12sp5o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign", "slemicro54-ign", "slemicro55o", "slmicro60o", "almalinux8o", "almalinux9o", "centos7o", "libertylinux9o", "oraclelinux9o", "rocky8o", "rocky9o", "ubuntu2004o", "ubuntu2204o", "debian11o", "debian12o", "opensuse155o", "opensuse156o" ]
images = [ "sles12sp5o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign", "slemicro54-ign", "slemicro55o", "slmicro60o", "almalinux8o", "almalinux9o", "centos7o", "libertylinux9o", "oraclelinux9o", "rocky8o", "rocky9o", "ubuntu2004o", "ubuntu2204o", "ubuntu2404o", "debian11o", "debian12o", "opensuse155o", "opensuse156o" ]

mirror = "minima-mirror-ci-bv.mgr.suse.de"
use_mirror_images = true
Expand Down Expand Up @@ -657,6 +657,24 @@ module "ubuntu2204_minion" {
ssh_key_path = "./salt/controller/id_rsa.pub"
}

module "ubuntu2404_minion" {
source = "./modules/minion"
base_configuration = module.base_core.configuration
product_version = "4.3-released"
name = "ubuntu2404-minion"
image = "ubuntu2404o"
provider_settings = {
mac = "aa:b2:92:42:00:bd"
memory = 4096
}
server_configuration = {
hostname = "suma-bv-43-proxy.mgr.suse.de"
}
auto_connect_to_master = false
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"
}

module "debian11_minion" {
source = "./modules/minion"
base_configuration = module.base_core.configuration
Expand Down Expand Up @@ -1159,6 +1177,20 @@ module "ubuntu2204_sshminion" {
ssh_key_path = "./salt/controller/id_rsa.pub"
}

module "ubuntu2404_sshminion" {
source = "./modules/sshminion"
base_configuration = module.base_core.configuration
product_version = "4.3-released"
name = "ubuntu2404-sshminion"
image = "ubuntu2404o"
provider_settings = {
mac = "aa:b2:92:42:00:dd"
memory = 4096
}
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"
}

module "debian11_sshminion" {
source = "./modules/sshminion"
base_configuration = module.base_core.configuration
Expand Down Expand Up @@ -1500,6 +1532,9 @@ module "controller" {
ubuntu2204_minion_configuration = module.ubuntu2204_minion.configuration
ubuntu2204_sshminion_configuration = module.ubuntu2204_sshminion.configuration

ubuntu2404_minion_configuration = module.ubuntu2404_minion.configuration
ubuntu2404_sshminion_configuration = module.ubuntu2404_sshminion.configuration

debian11_minion_configuration = module.debian11_minion.configuration
debian11_sshminion_configuration = module.debian11_sshminion.configuration

Expand Down
43 changes: 42 additions & 1 deletion terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ module "base_debian" {
name_prefix = "suma-bv-43-"
use_avahi = false
domain = "mgr.prv.suse.net"
images = [ "ubuntu2004o", "ubuntu2204o", "debian11o", "debian12o" ]
images = [ "ubuntu2004o", "ubuntu2204o", "ubuntu2404", "debian11o", "debian12o" ]

mirror = "minima-mirror-ci-bv.mgr.prv.suse.net"
use_mirror_images = true
Expand Down Expand Up @@ -872,6 +872,27 @@ module "ubuntu2204_minion" {
ssh_key_path = "./salt/controller/id_rsa.pub"
}

module "ubuntu2404_minion" {
providers = {
libvirt = libvirt.mandalore
}
source = "./modules/minion"
base_configuration = module.base_debian.configuration
product_version = "4.3-released"
name = "ubuntu2404-minion"
image = "ubuntu2404o"
provider_settings = {
mac = "aa:b2:92:05:00:bd"
memory = 4096
}
server_configuration = {
hostname = "suma-bv-43-proxy.mgr.prv.suse.net"
}
auto_connect_to_master = false
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"
}

module "debian11_minion" {
providers = {
libvirt = libvirt.mandalore
Expand Down Expand Up @@ -1446,6 +1467,23 @@ module "ubuntu2204_sshminion" {
ssh_key_path = "./salt/controller/id_rsa.pub"
}

module "ubuntu2404_sshminion" {
providers = {
libvirt = libvirt.mandalore
}
source = "./modules/sshminion"
base_configuration = module.base_debian.configuration
product_version = "4.3-released"
name = "ubuntu2404-sshminion"
image = "ubuntu2404o"
provider_settings = {
mac = "aa:b2:92:05:00:dd"
memory = 4096
}
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"
}

module "debian11_sshminion" {
providers = {
libvirt = libvirt.mandalore
Expand Down Expand Up @@ -1826,6 +1864,9 @@ module "controller" {
ubuntu2204_minion_configuration = module.ubuntu2204_minion.configuration
ubuntu2204_sshminion_configuration = module.ubuntu2204_sshminion.configuration

ubuntu2404_minion_configuration = module.ubuntu2404_minion.configuration
ubuntu2404_sshminion_configuration = module.ubuntu2404_sshminion.configuration

debian11_minion_configuration = module.debian11_minion.configuration
debian11_sshminion_configuration = module.debian11_sshminion.configuration

Expand Down
Loading