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

SL Micro 6.1 infrastructure entries to the testsuite deployment mapping #1518

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

SL Micro 6.1 infrastructure entries to the testsuite deployment mapping #1518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbfd1ec
Build validation with SL Micro 6.1
szachovy Jan 14, 2025
59333fa
fill MAC records from galaxy infra
szachovy Jan 20, 2025
db6ec48
Merge remote-tracking branch 'origin' into slmicro-61
szachovy Jan 21, 2025
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
2 changes: 1 addition & 1 deletion jenkins_pipelines/environments/manager-4.3-qe-build-validation-AWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion jenkins_pipelines/environments/manager-4.3-qe-build-validation-NUE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion jenkins_pipelines/environments/manager-4.3-qe-build-validation-PRV
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion jenkins_pipelines/environments/manager-5.0-qe-build-validation-NUE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion jenkins_pipelines/environments/manager-5.0-qe-build-validation-PRV
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion jenkins_pipelines/environments/manager-qe-continuous-build-validation-NUE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
5 changes: 5 additions & 0 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 @@ -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/"},
Expand Down Expand Up @@ -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/"}
}

Expand Down
39 changes: 38 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 @@ -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
Expand Down Expand Up @@ -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 = "aa:b2:92:42:00:cc"
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
Expand Down Expand Up @@ -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 = "aa:b2:92:42:00:ec"
// 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
Expand Down Expand Up @@ -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

Expand Down
45 changes: 44 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 @@ -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
Expand Down Expand Up @@ -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 = "aa:b2:92:05:00:cc"
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
Expand Down Expand Up @@ -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 = "aa:b2:92:05:00:ec"
// memory = 2048
// }
// use_os_released_updates = false
// ssh_key_path = "./salt/controller/id_rsa.pub"
// }

module "sle12sp5_buildhost" {
providers = {
libvirt = libvirt.coruscant
Expand Down Expand Up @@ -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

Expand Down
40 changes: 39 additions & 1 deletion terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 = "aa:b2:92:42:00:7c"
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
Expand Down Expand Up @@ -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 = "aa:b2:92:42:00:9c"
// 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
Expand Down Expand Up @@ -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

Expand Down
47 changes: 46 additions & 1 deletion terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 = "aa:b2:92:05:00:2c"
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
Expand Down Expand Up @@ -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 = "aa:b2:92:05:00:4c"
// 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
Expand Down Expand Up @@ -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

Expand Down
Loading
Loading