From fbfd1ecb1bfd03d8f7972a1c13952a0a54695136 Mon Sep 17 00:00:00 2001 From: szachovy Date: Tue, 14 Jan 2025 10:29:53 +0100 Subject: [PATCH 1/2] Build validation with SL Micro 6.1 --- README.md | 2 +- .../manager-4.3-qe-build-validation-AWS | 2 +- .../manager-4.3-qe-build-validation-NUE | 2 +- .../manager-4.3-qe-build-validation-PRV | 2 +- .../manager-5.0-qe-build-validation-NUE | 2 +- .../manager-5.0-qe-build-validation-PRV | 2 +- ...manager-qe-continuous-build-validation-NUE | 2 +- .../uyuni-master-qe-build-validation-NUE | 2 +- .../uyuni-master-qe-build-validation-PRV | 2 +- .../maintenance_json_generator.py | 5 ++ .../SUSEManager-4.3-build-validation-NUE.tf | 39 ++++++++++++++- .../SUSEManager-4.3-build-validation-PRV.tf | 45 +++++++++++++++++- .../SUSEManager-5.0-build-validation-NUE.tf | 40 +++++++++++++++- .../SUSEManager-5.0-build-validation-PRV.tf | 47 ++++++++++++++++++- ...Manager-continuous-build-validation-NUE.tf | 40 +++++++++++++++- .../Uyuni-Master-build-validation-NUE.tf | 38 ++++++++++++++- .../Uyuni-Master-build-validation-PRV.tf | 44 ++++++++++++++++- 17 files changed, 300 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 88668825e..c0fc2a443 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,6 @@ image for testing Pull Requests built with the open build service. This needs to | PR test | Leap 15.5 | Leap 15.5 | - | Rocky 8 | Ubuntu 22.04 | Leap 15.5 | SLES 15 SP4 | SLES 15 SP4 | Leap 15.5 | Leap 15.5 | Leap 15.5 | | Uyuni | Leap 15.5 | Leap 15.5 | - | Rocky 8 | Ubuntu 22.04 | Leap 15.5 | SLES 15 SP4 | SLES 15 SP4 | Leap 15.5 | Leap 15.5 | Leap 15.5 | | Uyuni Podman | Leap 15.5 | Leap 15.5 | - | Rocky 8 | Ubuntu 22.04 | Leap 15.5 | SLES 15 SP4 | SLES 15 SP4 | Leap 15.5 | Leap Micro 5.5 | Leap Micro 5.5 | -| HEAD | SLES 15 SP4 | SLES 15 SP4 | - | Rocky 8 | Ubuntu 22.04 | SLES 15 SP4 | SLES 15 SP4 | SLES 15 SP4 | Leap 15.5 | SLE Micro 5.5 | SLE Micro 5.5 | +| HEAD | SLES 15 SP4 | SLES 15 SP4 | - | Rocky 8 | Ubuntu 22.04 | SLES 15 SP4 | SLES 15 SP4 | SLES 15 SP4 | Leap 15.5 | SL Micro 6.1 | SL Micro 6.1 | | 4.3 | SLES 15 SP4 | SLES 15 SP4 | SLES 15 SP4 | Rocky 8 | Ubuntu 22.04 | SLES 15 SP4 | SLES 15 SP4 | SLES 15 SP4 | Leap 15.5 | SLES 15 SP4 | SLES 15 SP4 | | 5.0 | SLES 15 SP4 | SLES 15 SP4 | - | Rocky 8 | Ubuntu 22.04 | SLES 15 SP4 | SLES 15 SP4 | SLES 15 SP4 | Leap 15.5 | SLE Micro 5.5 | SLE Micro 5.5 | 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 c08c7a069..0a603e8d8 100644 --- a/jenkins_pipelines/environments/manager-4.3-qe-build-validation-AWS +++ b/jenkins_pipelines/environments/manager-4.3-qe-build-validation-AWS @@ -17,7 +17,7 @@ node('sumaform-cucumber-provo') { 'debian11_minion, debian11_sshminion, debian12_minion, debian12_sshminion, ' + 'opensuse155arm_minion, opensuse155arm_sshminion, ' + 'opensuse156arm_minion, opensuse156arm_sshminion, ' + - 'slemicro51_minion, slemicro52_minion, slemicro53_minion, slemicro54_minion, slemicro55_minion, slmicro60_minion' + 'slemicro51_minion, slemicro52_minion, slemicro53_minion, slemicro54_minion, slemicro55_minion, slmicro60_minion, slmicro61_minion' properties([ buildDiscarder(logRotator(numToKeepStr: '5', artifactNumToKeepStr: '3')), disableConcurrentBuilds(), 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 ccbc6d6be..e18d0b345 100644 --- a/jenkins_pipelines/environments/manager-4.3-qe-build-validation-NUE +++ b/jenkins_pipelines/environments/manager-4.3-qe-build-validation-NUE @@ -18,7 +18,7 @@ node('sumaform-cucumber') { 'opensuse155arm_minion, opensuse155arm_sshminion, ' + 'opensuse156arm_minion, opensuse156arm_sshminion, ' + 'sles15sp5s390_minion, sles15sp5s390_sshminion, ' + - 'slemicro51_minion, slemicro52_minion, slemicro53_minion, slemicro54_minion, slemicro55_minion, slmicro60_minion' + 'slemicro51_minion, slemicro52_minion, slemicro53_minion, slemicro54_minion, slemicro55_minion, slmicro60_minion, slmicro61_minion' properties([ buildDiscarder(logRotator(numToKeepStr: '5', artifactNumToKeepStr: '3')), disableConcurrentBuilds(), 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 40f8c58cf..69addada6 100644 --- a/jenkins_pipelines/environments/manager-4.3-qe-build-validation-PRV +++ b/jenkins_pipelines/environments/manager-4.3-qe-build-validation-PRV @@ -18,7 +18,7 @@ node('sumaform-cucumber-provo') { 'opensuse155arm_minion, opensuse155arm_sshminion, ' + 'opensuse156arm_minion, opensuse156arm_sshminion, ' + 'sles15sp5s390_minion, sles15sp5s390_sshminion, ' + - 'slemicro51_minion, slemicro52_minion, slemicro53_minion, slemicro54_minion, slemicro55_minion, slmicro60_minion' + 'slemicro51_minion, slemicro52_minion, slemicro53_minion, slemicro54_minion, slemicro55_minion, slmicro60_minion, slmicro61_minion' properties([ buildDiscarder(logRotator(numToKeepStr: '5', artifactNumToKeepStr: '3')), disableConcurrentBuilds(), diff --git a/jenkins_pipelines/environments/manager-5.0-qe-build-validation-NUE b/jenkins_pipelines/environments/manager-5.0-qe-build-validation-NUE index 4b81dc733..32f59d803 100644 --- a/jenkins_pipelines/environments/manager-5.0-qe-build-validation-NUE +++ b/jenkins_pipelines/environments/manager-5.0-qe-build-validation-NUE @@ -18,7 +18,7 @@ node('sumaform-cucumber') { 'opensuse155arm_minion, opensuse155arm_sshminion, ' + 'opensuse156arm_minion, opensuse156arm_sshminion, ' + 'sles15sp5s390_minion, sles15sp5s390_sshminion, ' + - 'slemicro51_minion, slemicro52_minion, slemicro53_minion, slemicro54_minion, slemicro55_minion, slmicro60_minion' + 'slemicro51_minion, slemicro52_minion, slemicro53_minion, slemicro54_minion, slemicro55_minion, slmicro60_minion, slmicro61_minion' properties([ buildDiscarder(logRotator(numToKeepStr: '5', artifactNumToKeepStr: '3')), disableConcurrentBuilds(), diff --git a/jenkins_pipelines/environments/manager-5.0-qe-build-validation-PRV b/jenkins_pipelines/environments/manager-5.0-qe-build-validation-PRV index ded442710..f25aaf133 100644 --- a/jenkins_pipelines/environments/manager-5.0-qe-build-validation-PRV +++ b/jenkins_pipelines/environments/manager-5.0-qe-build-validation-PRV @@ -18,7 +18,7 @@ node('sumaform-cucumber-provo') { 'opensuse155arm_minion, opensuse155arm_sshminion, ' + 'opensuse156arm_minion, opensuse156arm_sshminion, ' + 'sles15sp5s390_minion, sles15sp5s390_sshminion, ' + - 'slemicro51_minion, slemicro52_minion, slemicro53_minion, slemicro54_minion, slemicro55_minion, slmicro60_minion' + 'slemicro51_minion, slemicro52_minion, slemicro53_minion, slemicro54_minion, slemicro55_minion, slmicro60_minion, slmicro61_minion' properties([ buildDiscarder(logRotator(numToKeepStr: '5', artifactNumToKeepStr: '3')), disableConcurrentBuilds(), diff --git a/jenkins_pipelines/environments/manager-qe-continuous-build-validation-NUE b/jenkins_pipelines/environments/manager-qe-continuous-build-validation-NUE index dcafd56e8..3037e34d8 100644 --- a/jenkins_pipelines/environments/manager-qe-continuous-build-validation-NUE +++ b/jenkins_pipelines/environments/manager-qe-continuous-build-validation-NUE @@ -18,7 +18,7 @@ node('sumaform-cucumber') { 'opensuse155arm_minion, opensuse155arm_sshminion, ' + 'opensuse156arm_minion, opensuse156arm_sshminion, ' + 'sles15sp5s390_minion, sles15sp5s390_sshminion, ' + - 'slemicro51_minion, slemicro52_minion, slemicro53_minion, slemicro54_minion, slemicro55_minion, slmicro60_minion' + 'slemicro51_minion, slemicro52_minion, slemicro53_minion, slemicro54_minion, slemicro55_minion, slmicro60_minion, slmicro61_minion' properties([ buildDiscarder(logRotator(numToKeepStr: '5', artifactNumToKeepStr: '3')), disableConcurrentBuilds(), diff --git a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE index 66d8038e3..0788001a5 100644 --- a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE +++ b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE @@ -18,7 +18,7 @@ node('sumaform-cucumber') { 'opensuse155arm_minion, opensuse155arm_sshminion, ' + 'opensuse156arm_minion, opensuse156arm_sshminion, ' + 'sles15sp5s390_minion, sles15sp5s390_sshminion, ' + - 'slemicro51_minion, slemicro52_minion, slemicro53_minion, slemicro54_minion, slemicro55_minion, slmicro60_minion' + 'slemicro51_minion, slemicro52_minion, slemicro53_minion, slemicro54_minion, slemicro55_minion, slmicro60_minion, slmicro61_minion' properties([ buildDiscarder(logRotator(numToKeepStr: '5', artifactNumToKeepStr: '3')), disableConcurrentBuilds(), diff --git a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV index dce0e0d26..d808c35eb 100644 --- a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV +++ b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV @@ -18,7 +18,7 @@ node('sumaform-cucumber-provo') { 'opensuse155arm_minion, opensuse155arm_sshminion, ' + 'opensuse156arm_minion, opensuse156arm_sshminion, ' + 'sles15sp5s390_minion, sles15sp5s390_sshminion, ' + - 'slemicro51_minion, slemicro52_minion, slemicro53_minion, slemicro54_minion, slemicro55_minion, slmicro60_minion' + 'slemicro51_minion, slemicro52_minion, slemicro53_minion, slemicro54_minion, slemicro55_minion, slmicro60_minion, slmicro61_minion' properties([ buildDiscarder(logRotator(numToKeepStr: '5', artifactNumToKeepStr: '3')), disableConcurrentBuilds(), diff --git a/jenkins_pipelines/scripts/json_generator/maintenance_json_generator.py b/jenkins_pipelines/scripts/json_generator/maintenance_json_generator.py index 43a9a9eba..814f8ffd1 100644 --- a/jenkins_pipelines/scripts/json_generator/maintenance_json_generator.py +++ b/jenkins_pipelines/scripts/json_generator/maintenance_json_generator.py @@ -93,6 +93,9 @@ "slmicro60_minion": {"/SUSE_Updates_SLE-Manager-Tools-For-Micro_6_x86_64/", "/SUSE_Updates_SUSE-MicroOS_6.0_x86_64/", "/SUSE_Updates_SLE-Micro_6.0_x86_64/"}, + "slmicro61_minion": {"/SUSE_Updates_SLE-Manager-Tools-For-Micro_6_x86_64/", + "/SUSE_Updates_SUSE-MicroOS_6.1_x86_64/", + "/SUSE_Updates_SLE-Micro_6.1_x86_64/"}, "salt_migration_minion": {"/SUSE_Updates_SLE-Manager-Tools_15_x86_64/", "/SUSE_Updates_SLE-Module-Basesystem_15-SP5_x86_64/", "/SUSE_Updates_SLE-Module-Server-Applications_15-SP5_x86_64/"}, @@ -145,6 +148,8 @@ "/SUSE_Updates_SLE-Manager-Tools_15-BETA_x86_64/"}, "slmicro60_minion": {"/SUSE_Updates_SLE-Manager-Tools-BETA-For-Micro_6_x86_64/", "/SUSE_Updates_SLE-Manager-Tools_15-BETA_x86_64/"}, + "slmicro61_minion": {"/SUSE_Updates_SLE-Manager-Tools-BETA-For-Micro_6_x86_64/", + "/SUSE_Updates_SLE-Manager-Tools_15-BETA_x86_64/"}, "salt_migration_minion": {"/SUSE_Updates_SLE-Manager-Tools_15_x86_64-BETA/"} } 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 6493576c6..20ba3ad00 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 @@ -116,7 +116,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", "ubuntu2404o", "debian11o", "debian12o", "opensuse155o", "opensuse156o" ] + images = [ "sles12sp5o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign", "slemicro54-ign", "slemicro55o", "slmicro60o", "slmicro61o", "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 @@ -903,6 +903,25 @@ module "slmicro60_minion" { install_salt_bundle = false } +module "slmicro61_minion" { + source = "./modules/minion" + base_configuration = module.base_core.configuration + name = "slmicro61-minion" + image = "slmicro61o" + provider_settings = { + mac = "..." + memory = 2048 + } + + 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" + install_salt_bundle = false +} + module "sles12sp5_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration @@ -1306,6 +1325,20 @@ module "sles15sp5s390_sshminion" { // ssh_key_path = "./salt/controller/id_rsa.pub" // } +// WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed +// module "slmicro61_sshminion" { +// source = "./modules/sshminion" +// base_configuration = module.base_core.configuration +// name = "slmicro61-sshminion" +// image = "slmicro61o" +// provider_settings = { +// mac = "..." +// memory = 2048 +// } +// use_os_released_updates = false +// ssh_key_path = "./salt/controller/id_rsa.pub" +// } + module "sles12sp5_buildhost" { source = "./modules/build_host" base_configuration = module.base_core.configuration @@ -1509,6 +1542,10 @@ module "controller" { // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed // slmicro60_sshminion_configuration = module.slmicro60_sshminion.configuration + slmicro61_minion_configuration = module.slmicro61_minion.configuration +// WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed +// slmicro61_sshminion_configuration = module.slmicro61_sshminion.configuration + sle12sp5_buildhost_configuration = module.sles12sp5_buildhost.configuration sle15sp4_buildhost_configuration = module.sles15sp4_buildhost.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 d797922be..65251bf26 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 @@ -215,7 +215,7 @@ module "base_new_sle" { name_prefix = "suma-bv-43-" use_avahi = false domain = "mgr.prv.suse.net" - images = [ "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign" , "slemicro54-ign", "slemicro55o", "slmicro60o" ] + images = [ "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign" , "slemicro54-ign", "slemicro55o", "slmicro60o", "slmicro61o" ] mirror = "minima-mirror-ci-bv.mgr.prv.suse.net" use_mirror_images = true @@ -1156,6 +1156,28 @@ module "slmicro60_minion" { install_salt_bundle = false } +module "slmicro61_minion" { + providers = { + libvirt = libvirt.moscowmule + } + source = "./modules/minion" + base_configuration = module.base_new_sle.configuration + name = "slmicro61-minion" + image = "slmicro61o" + provider_settings = { + mac = "..." + memory = 2048 + } + + 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" + install_salt_bundle = false +} + module "sle12sp5_sshminion" { providers = { libvirt = libvirt.endor @@ -1632,6 +1654,23 @@ module "sle15sp5s390_sshminion" { // ssh_key_path = "./salt/controller/id_rsa.pub" // } +// WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed +// module "slmicro61_sshminion" { +// providers = { +// libvirt = libvirt.moscowmule +// } +// source = "./modules/sshminion" +// base_configuration = module.base_new_sle.configuration +// name = "slmicro61-sshminion" +// image = "slmicro61o" +// provider_settings = { +// mac = "..." +// memory = 2048 +// } +// use_os_released_updates = false +// ssh_key_path = "./salt/controller/id_rsa.pub" +// } + module "sle12sp5_buildhost" { providers = { libvirt = libvirt.coruscant @@ -1850,6 +1889,10 @@ module "controller" { // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed // slmicro60_sshminion_configuration = module.slmicro60_sshminion.configuration + slmicro61_minion_configuration = module.slmicro61_minion.configuration +// WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed +// slmicro61_sshminion_configuration = module.slmicro61_sshminion.configuration + sle12sp5_buildhost_configuration = module.sle12sp5_buildhost.configuration sle15sp4_buildhost_configuration = module.sle15sp4_buildhost.configuration diff --git a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf index c01190678..8439613f4 100644 --- a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf +++ b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf @@ -120,7 +120,7 @@ module "base_core" { name_prefix = "suma-bv-50-" 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", "ubuntu2404o", "debian11o", "debian12o", "opensuse155o", "opensuse156armo" ] + images = [ "sles12sp5o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign", "slemicro54-ign", "slemicro55o", "slmicro60o", "slmicro61o", "almalinux8o", "almalinux9o", "centos7o", "libertylinux9o", "oraclelinux9o", "rocky8o", "rocky9o", "ubuntu2004o", "ubuntu2204o", "ubuntu2404o", "debian11o", "debian12o", "opensuse155o", "opensuse156armo" ] mirror = "minima-mirror-ci-bv.mgr.suse.de" use_mirror_images = true @@ -673,6 +673,24 @@ module "slmicro60_minion" { install_salt_bundle = false } +module "slmicro61_minion" { + source = "./modules/minion" + base_configuration = module.base_core.configuration + name = "slmicro61-minion" + image = "slmicro61o" + provider_settings = { + mac = "..." + memory = 2048 + } + + auto_connect_to_master = false + use_os_released_updates = false + ssh_key_path = "./salt/controller/id_rsa.pub" + +// WORKAROUND: Does not work in sumaform, yet + install_salt_bundle = false +} + module "sles12sp5_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration @@ -1057,6 +1075,22 @@ module "sles15sp5s390_sshminion" { // //} +// WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed +// module "slmicro61_sshminion" { +// source = "./modules/sshminion" +// base_configuration = module.base_core.configuration +// name = "slmicro61-sshminion" +// image = "slmicro61o" +// provider_settings = { +// mac = "..." +// memory = 2048 +// } +// use_os_released_updates = false +// ssh_key_path = "./salt/controller/id_rsa.pub" +// +// +//} + module "sles12sp5_buildhost" { source = "./modules/build_host" base_configuration = module.base_core.configuration @@ -1261,6 +1295,10 @@ module "controller" { // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed // slmicro60_sshminion_configuration = module.slmicro60_sshminion.configuration + slmicro61_minion_configuration = module.slmicro61_minion.configuration +// WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed +// slmicro61_sshminion_configuration = module.slmicro61_sshminion.configuration + sle12sp5_buildhost_configuration = module.sles12sp5_buildhost.configuration sle15sp4_buildhost_configuration = module.sles15sp4_buildhost.configuration diff --git a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf index 6ee8dc11c..dd58572a9 100644 --- a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf +++ b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf @@ -219,7 +219,7 @@ module "base_new_sle" { name_prefix = "suma-bv-50-" use_avahi = false domain = "mgr.prv.suse.net" - images = [ "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign", "slemicro54-ign", "slemicro55o", "slmicro60o" ] + images = [ "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign", "slemicro54-ign", "slemicro55o", "slmicro60o", "slmicro61o" ] mirror = "minima-mirror-ci-bv.mgr.prv.suse.net" use_mirror_images = true @@ -904,6 +904,27 @@ module "slmicro60_minion" { install_salt_bundle = false } +module "slmicro61_minion" { + providers = { + libvirt = libvirt.florina + } + source = "./modules/minion" + base_configuration = module.base_new_sle.configuration + name = "slmicro61-minion" + image = "slmicro61o" + provider_settings = { + mac = "..." + memory = 2048 + } + + auto_connect_to_master = false + use_os_released_updates = false + ssh_key_path = "./salt/controller/id_rsa.pub" + +// WORKAROUND: Does not work in sumaform, yet + install_salt_bundle = false +} + module "sles12sp5_sshminion" { providers = { libvirt = libvirt.tatooine @@ -1370,6 +1391,26 @@ module "sles15sp5s390_sshminion" { // install_salt_bundle = true // } +// WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed +// module "slmicro61_sshminion" { +// providers = { +// libvirt = libvirt.florina +// } +// source = "./modules/sshminion" +// base_configuration = module.base_new_sle.configuration +// name = "slmicro61-sshminion" +// image = "slmicro61o" +// provider_settings = { +// mac = "..." +// memory = 2048 +// } +// use_os_released_updates = false +// ssh_key_path = "./salt/controller/id_rsa.pub" +// +// additional_packages = [ "venv-salt-minion" ] +// install_salt_bundle = true +// } + module "sles12sp5_buildhost" { providers = { libvirt = libvirt.terminus @@ -1587,6 +1628,10 @@ module "controller" { // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed // slmicro60_sshminion_configuration = module.slmicro60_sshminion.configuration + slmicro61_minion_configuration = module.slmicro61_minion.configuration +// WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed +// slmicro61_sshminion_configuration = module.slmicro61_sshminion.configuration + sle12sp5_buildhost_configuration = module.sles12sp5_buildhost.configuration sle15sp4_buildhost_configuration = module.sles15sp4_buildhost.configuration diff --git a/terracumber_config/tf_files/SUSEManager-continuous-build-validation-NUE.tf b/terracumber_config/tf_files/SUSEManager-continuous-build-validation-NUE.tf index 50ef00a31..66a2a5245 100644 --- a/terracumber_config/tf_files/SUSEManager-continuous-build-validation-NUE.tf +++ b/terracumber_config/tf_files/SUSEManager-continuous-build-validation-NUE.tf @@ -125,7 +125,7 @@ module "base_core" { name_prefix = "suma-continuous-bv-" 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", "ubuntu2404o", "debian11o", "debian12o", "opensuse155o", "opensuse156armo" ] + images = [ "sles12sp5o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign", "slemicro54-ign", "slemicro55o", "slmicro60o", "slmicro61o", "almalinux8o", "almalinux9o", "centos7o", "libertylinux9o", "oraclelinux9o", "rocky8o", "rocky9o", "ubuntu2004o", "ubuntu2204o", "ubuntu2404o", "debian11o", "debian12o", "opensuse155o", "opensuse156armo" ] mirror = "minima-mirror-ci-bv.mgr.suse.de" use_mirror_images = true @@ -678,6 +678,24 @@ module "slmicro60_minion" { install_salt_bundle = false } +module "slmicro61_minion" { + source = "./modules/minion" + base_configuration = module.base_core.configuration + name = "slmicro61-minion" + image = "slmicro61o" + provider_settings = { + mac = "..." + memory = 2048 + } + + auto_connect_to_master = false + use_os_released_updates = false + ssh_key_path = "./salt/controller/id_rsa.pub" + +// WORKAROUND: Does not work in sumaform, yet + install_salt_bundle = false +} + module "sles12sp5_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration @@ -1062,6 +1080,22 @@ module "sles15sp5s390_sshminion" { // //} +// WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed +// module "slmicro61_sshminion" { +// source = "./modules/sshminion" +// base_configuration = module.base_core.configuration +// name = "slmicro61-sshminion" +// image = "slmicro61o" +// provider_settings = { +// mac = "..." +// memory = 2048 +// } +// use_os_released_updates = false +// ssh_key_path = "./salt/controller/id_rsa.pub" +// +// +//} + module "sles12sp5_buildhost" { source = "./modules/build_host" base_configuration = module.base_core.configuration @@ -1266,6 +1300,10 @@ module "controller" { // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed // slmicro60_sshminion_configuration = module.slmicro60_sshminion.configuration + slmicro61_minion_configuration = module.slmicro61_minion.configuration +// WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed +// slmicro61_sshminion_configuration = module.slmicro61_sshminion.configuration + sle12sp5_buildhost_configuration = module.sles12sp5_buildhost.configuration sle15sp4_buildhost_configuration = module.sles15sp4_buildhost.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 ea0e3c8ef..23d879a9e 100644 --- a/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf +++ b/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf @@ -120,7 +120,7 @@ module "base_core" { name_prefix = "uyuni-bv-master-" 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", "ubuntu2404o", "debian11o", "debian12o", "opensuse155o", "opensuse156o", "leapmicro55o" ] + images = [ "sles12sp5o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign", "slemicro54-ign", "slemicro55o", "slmicro60o", "slmicro61o", "almalinux8o", "almalinux9o", "centos7o", "libertylinux9o", "oraclelinux9o", "rocky8o", "rocky9o", "ubuntu2004o", "ubuntu2204o", "ubuntu2404o", "debian11o", "debian12o", "opensuse155o", "opensuse156o", "leapmicro55o" ] mirror = "minima-mirror-ci-bv.mgr.suse.de" use_mirror_images = true @@ -676,6 +676,24 @@ module "slmicro60_minion" { install_salt_bundle = false } +module "slmicro61_minion" { + source = "./modules/minion" + base_configuration = module.base_core.configuration + name = "slmicro61-minion" + image = "slmicro61o" + provider_settings = { + mac = "..." + memory = 2048 + } + + auto_connect_to_master = false + use_os_released_updates = false + ssh_key_path = "./salt/controller/id_rsa.pub" +// WORKAROUND: Does not work in sumaform, yet +// additional_packages = [ "venv-salt-minion" ] + install_salt_bundle = false +} + module "sles12sp5_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration @@ -1054,6 +1072,20 @@ module "sles15sp5s390_sshminion" { // ssh_key_path = "./salt/controller/id_rsa.pub" // } +// WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed +// module "slmicro61_sshminion" { +// source = "./modules/sshminion" +// base_configuration = module.base_core.configuration +// name = "slmicro61-sshminion" +// image = "slmicro61o" +// provider_settings = { +// mac = "..." +// memory = 2048 +// } +// use_os_released_updates = false +// ssh_key_path = "./salt/controller/id_rsa.pub" +// } + module "sles12sp5_buildhost" { source = "./modules/build_host" base_configuration = module.base_core.configuration @@ -1236,6 +1268,10 @@ module "controller" { // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed // slmicro60_sshminion_configuration = module.slmicro60_sshminion.configuration + slmicro61_minion_configuration = module.slmicro61_minion.configuration +// WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed +// slmicro61_sshminion_configuration = module.slmicro61_sshminion.configuration + sle12sp5_buildhost_configuration = module.sles12sp5_buildhost.configuration sle15sp4_buildhost_configuration = module.sles15sp4_buildhost.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 519775ab7..07e19d5ec 100644 --- a/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf +++ b/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf @@ -219,7 +219,7 @@ module "base_new_sle" { name_prefix = "uyuni-bv-master-" use_avahi = false domain = "mgr.prv.suse.net" - images = [ "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign", "slemicro54-ign", "slemicro55o", "slmicro60o" ] + images = [ "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign", "slemicro54-ign", "slemicro55o", "slmicro60o", "slmicro61o" ] mirror = "minima-mirror-ci-bv.mgr.prv.suse.net" use_mirror_images = true @@ -910,6 +910,27 @@ module "slmicro60_minion" { install_salt_bundle = false } +module "slmicro61_minion" { + providers = { + libvirt = libvirt.ginfizz + } + source = "./modules/minion" + base_configuration = module.base_new_sle.configuration + name = "slmicro61-minion" + image = "slmicro61o" + provider_settings = { + mac = "aa:b2:93:04:05:97" + memory = 2048 + } + + auto_connect_to_master = false + use_os_released_updates = false + ssh_key_path = "./salt/controller/id_rsa.pub" +// WORKAROUND: Does not work in sumaform, yet +// additional_packages = [ "venv-salt-minion" ] + install_salt_bundle = false +} + module "sles12sp5_sshminion" { providers = { libvirt = libvirt.cosmopolitan @@ -1367,6 +1388,23 @@ module "sles15sp5s390_sshminion" { // ssh_key_path = "./salt/controller/id_rsa.pub" // } +// WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed +// module "slmicro61_sshminion" { +// providers = { +// libvirt = libvirt.ginfizz +// } +// source = "./modules/sshminion" +// base_configuration = module.base_new_sle.configuration +// name = "slmicro61-sshminion" +// image = "slmicro61o" +// provider_settings = { +// mac = "..." +// memory = 2048 +// } +// use_os_released_updates = false +// ssh_key_path = "./salt/controller/id_rsa.pub" +// } + module "sles12sp5_buildhost" { providers = { libvirt = libvirt.margarita @@ -1565,6 +1603,10 @@ module "controller" { // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed // slmicro60_sshminion_configuration = module.slmicro60_sshminion.configuration + slmicro61_minion_configuration = module.slmicro61_minion.configuration +// WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed +// slmicro61_sshminion_configuration = module.slmicro61_sshminion.configuration + sle12sp5_buildhost_configuration = module.sles12sp5_buildhost.configuration sle15sp4_buildhost_configuration = module.sles15sp4_buildhost.configuration From 59333fab9e7baf9b09281043a32dc129a2c606ed Mon Sep 17 00:00:00 2001 From: szachovy Date: Mon, 20 Jan 2025 20:57:03 +0100 Subject: [PATCH 2/2] fill MAC records from galaxy infra --- .../tf_files/SUSEManager-4.3-build-validation-NUE.tf | 4 ++-- .../tf_files/SUSEManager-4.3-build-validation-PRV.tf | 4 ++-- .../tf_files/SUSEManager-5.0-build-validation-NUE.tf | 4 ++-- .../tf_files/SUSEManager-5.0-build-validation-PRV.tf | 4 ++-- .../tf_files/SUSEManager-continuous-build-validation-NUE.tf | 4 ++-- .../tf_files/Uyuni-Master-build-validation-NUE.tf | 4 ++-- .../tf_files/Uyuni-Master-build-validation-PRV.tf | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) 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 20ba3ad00..8b400bc40 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 @@ -909,7 +909,7 @@ module "slmicro61_minion" { name = "slmicro61-minion" image = "slmicro61o" provider_settings = { - mac = "..." + mac = "aa:b2:92:42:00:cc" memory = 2048 } @@ -1332,7 +1332,7 @@ module "sles15sp5s390_sshminion" { // name = "slmicro61-sshminion" // image = "slmicro61o" // provider_settings = { -// mac = "..." +// mac = "aa:b2:92:42:00:ec" // memory = 2048 // } // use_os_released_updates = false 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 65251bf26..06f999ba6 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 @@ -1165,7 +1165,7 @@ module "slmicro61_minion" { name = "slmicro61-minion" image = "slmicro61o" provider_settings = { - mac = "..." + mac = "aa:b2:92:05:00:cc" memory = 2048 } @@ -1664,7 +1664,7 @@ module "sle15sp5s390_sshminion" { // name = "slmicro61-sshminion" // image = "slmicro61o" // provider_settings = { -// mac = "..." +// mac = "aa:b2:92:05:00:ec" // memory = 2048 // } // use_os_released_updates = false diff --git a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf index 8439613f4..c8643e80b 100644 --- a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf +++ b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf @@ -679,7 +679,7 @@ module "slmicro61_minion" { name = "slmicro61-minion" image = "slmicro61o" provider_settings = { - mac = "..." + mac = "aa:b2:92:42:00:7c" memory = 2048 } @@ -1082,7 +1082,7 @@ module "sles15sp5s390_sshminion" { // name = "slmicro61-sshminion" // image = "slmicro61o" // provider_settings = { -// mac = "..." +// mac = "aa:b2:92:42:00:9c" // memory = 2048 // } // use_os_released_updates = false diff --git a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf index dd58572a9..6189079e2 100644 --- a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf +++ b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf @@ -913,7 +913,7 @@ module "slmicro61_minion" { name = "slmicro61-minion" image = "slmicro61o" provider_settings = { - mac = "..." + mac = "aa:b2:92:05:00:2c" memory = 2048 } @@ -1401,7 +1401,7 @@ module "sles15sp5s390_sshminion" { // name = "slmicro61-sshminion" // image = "slmicro61o" // provider_settings = { -// mac = "..." +// mac = "aa:b2:92:05:00:4c" // memory = 2048 // } // use_os_released_updates = false diff --git a/terracumber_config/tf_files/SUSEManager-continuous-build-validation-NUE.tf b/terracumber_config/tf_files/SUSEManager-continuous-build-validation-NUE.tf index 66a2a5245..43696c309 100644 --- a/terracumber_config/tf_files/SUSEManager-continuous-build-validation-NUE.tf +++ b/terracumber_config/tf_files/SUSEManager-continuous-build-validation-NUE.tf @@ -684,7 +684,7 @@ module "slmicro61_minion" { name = "slmicro61-minion" image = "slmicro61o" provider_settings = { - mac = "..." + mac = "aa:b2:93:01:02:a2" memory = 2048 } @@ -1087,7 +1087,7 @@ module "sles15sp5s390_sshminion" { // name = "slmicro61-sshminion" // image = "slmicro61o" // provider_settings = { -// mac = "..." +// mac = "aa:b2:92:42:00:9c" // memory = 2048 // } // use_os_released_updates = false 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 23d879a9e..c251c813e 100644 --- a/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf +++ b/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf @@ -682,7 +682,7 @@ module "slmicro61_minion" { name = "slmicro61-minion" image = "slmicro61o" provider_settings = { - mac = "..." + mac = "aa:b2:93:02:01:cc" memory = 2048 } @@ -1079,7 +1079,7 @@ module "sles15sp5s390_sshminion" { // name = "slmicro61-sshminion" // image = "slmicro61o" // provider_settings = { -// mac = "..." +// mac = "aa:b2:93:02:01:ec" // memory = 2048 // } // use_os_released_updates = false 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 07e19d5ec..a41e4e530 100644 --- a/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf +++ b/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf @@ -919,7 +919,7 @@ module "slmicro61_minion" { name = "slmicro61-minion" image = "slmicro61o" provider_settings = { - mac = "aa:b2:93:04:05:97" + mac = "aa:b2:93:04:05:98" memory = 2048 } @@ -1398,7 +1398,7 @@ module "sles15sp5s390_sshminion" { // name = "slmicro61-sshminion" // image = "slmicro61o" // provider_settings = { -// mac = "..." +// mac = "aa:b2:93:04:05:b8" // memory = 2048 // } // use_os_released_updates = false