diff --git a/jenkins_pipelines/scripts/json_generator/maintenance_json_generator.py b/jenkins_pipelines/scripts/json_generator/maintenance_json_generator.py index 585479b8c..6ee7d54e3 100644 --- a/jenkins_pipelines/scripts/json_generator/maintenance_json_generator.py +++ b/jenkins_pipelines/scripts/json_generator/maintenance_json_generator.py @@ -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/", @@ -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/"}, diff --git a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf index 9a6c385fe..1b3908ab1 100644 --- a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf +++ b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf index 6f2983313..8b3d45a2d 100644 --- a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf +++ b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf @@ -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 @@ -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 @@ -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 @@ -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