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.

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

Add Debian 12 #989

Merged
merged 1 commit into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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([
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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, ' +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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, ' +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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, ' +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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, ' +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -457,7 +473,7 @@ module "ubuntu2004-sshminion" {
instance_type = "t3a.medium"
}
}
//

//module "debian11-sshminion" {
// source = "./modules/sshminion"
// base_configuration = module.base.configuration
Expand All @@ -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
Expand Down Expand Up @@ -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

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
38 changes: 37 additions & 1 deletion terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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
Expand Down
44 changes: 43 additions & 1 deletion terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
Loading