diff --git a/jenkins_pipelines/environments/manager-4.3-qe-build-validation-AWS b/jenkins_pipelines/environments/manager-4.3-qe-build-validation-AWS index c46cb5eb4..6cd30e82c 100644 --- a/jenkins_pipelines/environments/manager-4.3-qe-build-validation-AWS +++ b/jenkins_pipelines/environments/manager-4.3-qe-build-validation-AWS @@ -13,7 +13,7 @@ node('sumaform-cucumber-provo') { 'oracle9_minion, oracle9_ssh_minion, ' + 'rocky8_minion, rocky8_ssh_minion, rocky9_minion, rocky9_ssh_minion, ' + 'ubuntu2004_minion, ubuntu2004_ssh_minion, ubuntu2204_minion, ubuntu2204_ssh_minion, ' + - 'debian10_minion, debian10_ssh_minion, debian11_minion, debian11_ssh_minion, ' + + 'debian10_minion, debian10_ssh_minion, debian11_minion, debian11_ssh_minion, debian12_minion, debian12_ssh_minion, ' + 'opensuse154arm_minion, opensuse154arm_ssh_minion, ' + 'slemicro51_minion, slemicro51_ssh_minion, slemicro52_minion, slemicro52_ssh_minion, slemicro53_minion, slemicro53_ssh_minion, slemicro54_minion, slemicro54_ssh_minion' properties([ diff --git a/jenkins_pipelines/environments/manager-4.3-qe-build-validation-NUE b/jenkins_pipelines/environments/manager-4.3-qe-build-validation-NUE index c44c4f7a6..b0965e6ba 100644 --- a/jenkins_pipelines/environments/manager-4.3-qe-build-validation-NUE +++ b/jenkins_pipelines/environments/manager-4.3-qe-build-validation-NUE @@ -14,7 +14,7 @@ node('sumaform-cucumber') { 'oracle9_minion, oracle9_ssh_minion, ' + 'rocky8_minion, rocky8_ssh_minion, rocky9_minion, rocky9_ssh_minion, ' + 'ubuntu2004_minion, ubuntu2004_ssh_minion, ubuntu2204_minion, ubuntu2204_ssh_minion, ' + - 'debian10_minion, debian10_ssh_minion, debian11_minion, debian11_ssh_minion, ' + + 'debian10_minion, debian10_ssh_minion, debian11_minion, debian11_ssh_minion, debian12_minion, debian12_ssh_minion, ' + 'opensuse154arm_minion, opensuse154arm_ssh_minion, ' + 'opensuse155arm_minion, opensuse155arm_ssh_minion, ' + 'slemicro51_minion, slemicro51_ssh_minion, ' + diff --git a/jenkins_pipelines/environments/manager-4.3-qe-build-validation-PRV b/jenkins_pipelines/environments/manager-4.3-qe-build-validation-PRV index 7f82c9582..47ec97dd0 100644 --- a/jenkins_pipelines/environments/manager-4.3-qe-build-validation-PRV +++ b/jenkins_pipelines/environments/manager-4.3-qe-build-validation-PRV @@ -14,7 +14,7 @@ node('sumaform-cucumber-provo') { 'oracle9_minion, oracle9_ssh_minion, ' + 'rocky8_minion, rocky8_ssh_minion, rocky9_minion, rocky9_ssh_minion, ' + 'ubuntu2004_minion, ubuntu2004_ssh_minion, ubuntu2204_minion, ubuntu2204_ssh_minion, ' + - 'debian10_minion, debian10_ssh_minion, debian11_minion, debian11_ssh_minion, ' + + 'debian10_minion, debian10_ssh_minion, debian11_minion, debian11_ssh_minion, debian12_minion, debian12_ssh_minion, ' + 'opensuse154arm_minion, opensuse154arm_ssh_minion, ' + 'opensuse155arm_minion, opensuse155arm_ssh_minion, ' + 'slemicro51_minion, slemicro51_ssh_minion, ' + diff --git a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE index 8207092da..6857fdc46 100644 --- a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE +++ b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE @@ -13,7 +13,7 @@ node('sumaform-cucumber') { 'oracle9_minion, oracle9_ssh_minion, ' + 'rocky8_minion, rocky8_ssh_minion, rocky9_minion, rocky9_ssh_minion, ' + 'ubuntu2004_minion, ubuntu2004_ssh_minion, ubuntu2204_minion, ubuntu2204_ssh_minion, ' + - 'debian10_minion, debian10_ssh_minion, debian11_minion, debian11_ssh_minion, ' + + 'debian10_minion, debian10_ssh_minion, debian11_minion, debian11_ssh_minion, debian12_minion, debian12_ssh_minion, ' + 'opensuse154arm_minion, opensuse154arm_ssh_minion, ' + 'opensuse155arm_minion, opensuse155arm_ssh_minion, ' + 'slemicro51_minion, slemicro51_ssh_minion, ' + diff --git a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV index 529de30d1..5283bb266 100644 --- a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV +++ b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV @@ -13,7 +13,7 @@ node('sumaform-cucumber-provo') { 'oracle9_minion, oracle9_ssh_minion, ' + 'rocky8_minion, rocky8_ssh_minion, rocky9_minion, rocky9_ssh_minion, ' + 'ubuntu2004_minion, ubuntu2004_ssh_minion, ubuntu2204_minion, ubuntu2204_ssh_minion, ' + - 'debian10_minion, debian10_ssh_minion, debian11_minion, debian11_ssh_minion, ' + + 'debian10_minion, debian10_ssh_minion, debian11_minion, debian11_ssh_minion, debian12_minion, debian12_ssh_minion, ' + 'opensuse154arm_minion, opensuse154arm_ssh_minion, ' + 'opensuse155arm_minion, opensuse155arm_ssh_minion, ' + 'slemicro51_minion, slemicro51_ssh_minion, ' + diff --git a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-AWS.tf b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-AWS.tf index 19d193526..438e9cb65 100644 --- a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-AWS.tf +++ b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-AWS.tf @@ -340,6 +340,22 @@ module "ubuntu2004-minion" { // } //} +//module "debian12-minion" { +// source = "./modules/minion" +// base_configuration = module.base.configuration +// product_version = "4.3-released" +// name = "min-debian12" +// image = "debian12" +// server_configuration = module.server.configuration +// auto_connect_to_master = false +// use_os_released_updates = false +// ssh_key_path = "./salt/controller/id_rsa.pub" +// +// provider_settings = { +// instance_type = "t3a.medium" +// } +//} + module "rocky8-minion" { source = "./modules/minion" base_configuration = module.base.configuration @@ -457,7 +473,7 @@ module "ubuntu2004-sshminion" { instance_type = "t3a.medium" } } -// + //module "debian11-sshminion" { // source = "./modules/sshminion" // base_configuration = module.base.configuration @@ -472,6 +488,20 @@ module "ubuntu2004-sshminion" { // } //} +//module "debian12-sshminion" { +// source = "./modules/sshminion" +// base_configuration = module.base.configuration +// product_version = "4.3-released" +// name = "minssh-debian12" +// image = "debian12" +// use_os_released_updates = false +// ssh_key_path = "./salt/controller/id_rsa.pub" +// +// provider_settings = { +// instance_type = "t3a.medium" +// } +//} + module "rocky8-sshminion" { source = "./modules/sshminion" base_configuration = module.base.configuration @@ -671,6 +701,9 @@ module "controller" { // debian11_minion_configuration = module.debian11-minion.configuration // debian11_sshminion_configuration = module.debian11-sshminion.configuration +// debian12_minion_configuration = module.debian12-minion.configuration +// debian12_sshminion_configuration = module.debian12-sshminion.configuration + rhel9_minion_configuration = module.rhel9-minion.configuration } 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 b5e12c4ed..8609ef186 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 @@ -101,7 +101,7 @@ module "base_core" { name_prefix = "suma-bv-43-" use_avahi = false domain = "mgr.suse.de" - images = [ "sles12sp4o", "sles12sp5o", "sles15sp1o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign", "slemicro54-ign", "almalinux9o", "centos7o", "libertylinux9o", "oraclelinux9o", "rocky8o", "rocky9o", "ubuntu2004o", "ubuntu2204o", "debian10o", "debian11o", "opensuse154o" ] + images = [ "sles12sp4o", "sles12sp5o", "sles15sp1o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign", "slemicro54-ign", "almalinux9o", "centos7o", "libertylinux9o", "oraclelinux9o", "rocky8o", "rocky9o", "ubuntu2004o", "ubuntu2204o", "debian10o", "debian11o", "debian12o", "opensuse154o" ] mirror = "minima-mirror-ci-bv.mgr.suse.de" use_mirror_images = true @@ -684,6 +684,25 @@ module "debian11-minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } +module "debian12-minion" { + source = "./modules/minion" + base_configuration = module.base_core.configuration + product_version = "4.3-released" + name = "min-debian12" + image = "debian12o" + provider_settings = { + mac = "aa:b2:92:42:00:bc" + memory = 4096 + } + + server_configuration = { + hostname = "suma-bv-43-pxy.mgr.suse.de" + } + auto_connect_to_master = false + use_os_released_updates = false + ssh_key_path = "./salt/controller/id_rsa.pub" +} + // WORKAROUND: overdrive3 has been disconnected by mistake //module "opensuse154arm-minion" { // providers = { @@ -1071,6 +1090,20 @@ module "debian11-sshminion" { ssh_key_path = "./salt/controller/id_rsa.pub" } +module "debian12-sshminion" { + source = "./modules/sshminion" + base_configuration = module.base_core.configuration + product_version = "4.3-released" + name = "minssh-debian12" + image = "debian12o" + provider_settings = { + mac = "aa:b2:92:42:00:dc" + memory = 4096 + } + use_os_released_updates = false + ssh_key_path = "./salt/controller/id_rsa.pub" +} + // WORKAROUND: overdrive3 has been disconnected by mistake //module "opensuse154arm-sshminion" { // providers = { @@ -1329,6 +1362,9 @@ module "controller" { debian11_minion_configuration = module.debian11-minion.configuration debian11_sshminion_configuration = module.debian11-sshminion.configuration + debian12_minion_configuration = module.debian12-minion.configuration + debian12_sshminion_configuration = module.debian12-sshminion.configuration + // WORKAROUND: overdrive3 has been disconnected by mistake // opensuse154arm_minion_configuration = module.opensuse154arm-minion.configuration // opensuse154arm_sshminion_configuration = module.opensuse154arm-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 69b19062e..ce3702e29 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 @@ -248,7 +248,7 @@ module "base_debian" { name_prefix = "suma-bv-43-" use_avahi = false domain = "mgr.prv.suse.net" - images = [ "ubuntu2004o", "ubuntu2204o", "debian10o", "debian11o" ] + images = [ "ubuntu2004o", "ubuntu2204o", "debian10o", "debian11o", "debian12o" ] mirror = "minima-mirror-ci-bv.mgr.prv.suse.net" use_mirror_images = true @@ -907,6 +907,28 @@ module "debian11-minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } +module "debian12-minion" { + providers = { + libvirt = libvirt.mandalore + } + source = "./modules/minion" + base_configuration = module.base_debian.configuration + product_version = "4.3-released" + name = "min-debian12" + image = "debian12o" + provider_settings = { + mac = "aa:b2:92:42:00:bc" + memory = 4096 + } + + server_configuration = { + hostname = "suma-bv-43-pxy.mgr.prv.suse.net" + } + auto_connect_to_master = false + use_os_released_updates = false + ssh_key_path = "./salt/controller/id_rsa.pub" +} + module "opensuse154arm-minion" { providers = { libvirt = libvirt.overdrive4 @@ -1355,6 +1377,23 @@ module "debian11-sshminion" { ssh_key_path = "./salt/controller/id_rsa.pub" } +module "debian12-sshminion" { + providers = { + libvirt = libvirt.mandalore + } + source = "./modules/sshminion" + base_configuration = module.base_debian.configuration + product_version = "4.3-released" + name = "minssh-debian12" + image = "debian12o" + provider_settings = { + mac = "aa:b2:92:42:00:dc" + memory = 4096 + } + use_os_released_updates = false + ssh_key_path = "./salt/controller/id_rsa.pub" +} + module "opensuse154arm-sshminion" { providers = { libvirt = libvirt.overdrive4 @@ -1638,6 +1677,9 @@ module "controller" { debian11_minion_configuration = module.debian11-minion.configuration debian11_sshminion_configuration = module.debian11-sshminion.configuration + debian12_minion_configuration = module.debian12-minion.configuration + debian12_sshminion_configuration = module.debian12-sshminion.configuration + opensuse154arm_minion_configuration = module.opensuse154arm-minion.configuration opensuse154arm_sshminion_configuration = module.opensuse154arm-sshminion.configuration diff --git a/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf b/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf index 82c25a3f2..30966d446 100644 --- a/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf +++ b/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf @@ -101,7 +101,7 @@ module "base_core" { name_prefix = "uyuni-bv-master-" use_avahi = false domain = "mgr.suse.de" - images = [ "sles12sp4o", "sles12sp5o", "sles15sp1o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign", "slemicro54-ign", "almalinux9o", "centos7o", "oraclelinux9o", "rocky8o", "rocky9o", "ubuntu2004o", "ubuntu2204o", "debian10o", "debian11o", "opensuse154o" ] + images = [ "sles12sp4o", "sles12sp5o", "sles15sp1o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign", "slemicro54-ign", "almalinux9o", "centos7o", "oraclelinux9o", "rocky8o", "rocky9o", "ubuntu2004o", "ubuntu2204o", "debian10o", "debian11o", "debian12o", "opensuse154o" ] mirror = "minima-mirror-ci-bv.mgr.suse.de" use_mirror_images = true @@ -519,6 +519,25 @@ module "debian11-minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } +module "debian12-minion" { + source = "./modules/minion" + base_configuration = module.base_core.configuration + product_version = "uyuni-master" + name = "min-debian12" + image = "debian12o" + provider_settings = { + mac = "aa:b2:93:02:01:bc" + memory = 4096 + } + + server_configuration = { + hostname = "uyuni-bv-master-pxy.mgr.suse.de" + } + auto_connect_to_master = false + use_os_released_updates = false + ssh_key_path = "./salt/controller/id_rsa.pub" +} + // WORKAROUND: overdrive3 has been disconnected by mistake //module "opensuse154arm-minion" { // providers = { @@ -889,6 +908,20 @@ module "debian11-sshminion" { ssh_key_path = "./salt/controller/id_rsa.pub" } +module "debian12-sshminion" { + source = "./modules/sshminion" + base_configuration = module.base_core.configuration + product_version = "uyuni-master" + name = "minssh-debian12" + image = "debian12o" + provider_settings = { + mac = "aa:b2:93:02:01:dc" + memory = 4096 + } + use_os_released_updates = false + ssh_key_path = "./salt/controller/id_rsa.pub" +} + // WORKAROUND: overdrive3 has been disconnected by mistake //module "opensuse154arm-sshminion" { // providers = { @@ -1136,6 +1169,9 @@ module "controller" { debian11_minion_configuration = module.debian11-minion.configuration debian11_sshminion_configuration = module.debian11-sshminion.configuration + debian12_minion_configuration = module.debian12-minion.configuration + debian12_sshminion_configuration = module.debian12-sshminion.configuration + // WORKAROUND: overdrive3 has been disconnected by mistake // opensuse154arm_minion_configuration = module.opensuse154arm-minion.configuration // opensuse154arm_sshminion_configuration = module.opensuse154arm-sshminion.configuration diff --git a/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf b/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf index f123e103b..d7d08f612 100644 --- a/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf +++ b/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf @@ -248,7 +248,7 @@ module "base_debian" { name_prefix = "uyuni-bv-master-" use_avahi = false domain = "mgr.prv.suse.net" - images = [ "ubuntu2004o", "ubuntu2204o", "debian10o", "debian11o" ] + images = [ "ubuntu2004o", "ubuntu2204o", "debian10o", "debian11o", "debian12o" ] mirror = "minima-mirror-ci-bv.mgr.prv.suse.net" use_mirror_images = true @@ -715,6 +715,28 @@ module "debian11-minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } +module "debian12-minion" { + providers = { + libvirt = libvirt.irishcoffee + } + source = "./modules/minion" + base_configuration = module.base_debian.configuration + product_version = "uyuni-master" + name = "min-debian12" + image = "debian12o" + provider_settings = { + mac = "aa:b2:93:02:01:88" + memory = 4096 + } + + server_configuration = { + hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + } + auto_connect_to_master = false + use_os_released_updates = false + ssh_key_path = "./salt/controller/id_rsa.pub" +} + module "opensuse154arm-minion" { providers = { libvirt = libvirt.overdrive4 @@ -1143,6 +1165,23 @@ module "debian11-sshminion" { ssh_key_path = "./salt/controller/id_rsa.pub" } +module "debian12-sshminion" { + providers = { + libvirt = libvirt.irishcoffee + } + source = "./modules/sshminion" + base_configuration = module.base_debian.configuration + product_version = "uyuni-master" + name = "minssh-debian12" + image = "debian12o" + provider_settings = { + mac = "aa:b2:93:02:01:a8" + memory = 4096 + } + use_os_released_updates = false + ssh_key_path = "./salt/controller/id_rsa.pub" +} + module "opensuse154arm-sshminion" { providers = { libvirt = libvirt.overdrive4 @@ -1415,6 +1454,9 @@ module "controller" { debian11_minion_configuration = module.debian11-minion.configuration debian11_sshminion_configuration = module.debian11-sshminion.configuration + debian12_minion_configuration = module.debian12-minion.configuration + debian12_sshminion_configuration = module.debian12-sshminion.configuration + opensuse154arm_minion_configuration = module.opensuse154arm-minion.configuration opensuse154arm_sshminion_configuration = module.opensuse154arm-sshminion.configuration