Add liberty linux 9 to uyuni BVs (#1400)

SUSE · Oct 2, 2024 · 35828bb · 35828bb
1 parent 1f406d3
commit 35828bb
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 2 deletions.
diff --git a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE
@@ -10,6 +10,7 @@ node('sumaform-cucumber') {
             'salt_migration_minion, ' +
             'alma8_minion, alma8_sshminion, alma9_minion, alma9_sshminion, ' +
             'centos7_minion, centos7_sshminion, ' +
+            'liberty9_minion, liberty9_sshminion, ' +
             'oracle9_minion, oracle9_sshminion, ' +
             'rocky8_minion, rocky8_sshminion, rocky9_minion, rocky9_sshminion, ' +
             'ubuntu2004_minion, ubuntu2004_sshminion, ubuntu2204_minion, ubuntu2204_sshminion, ubuntu2404_minion, ubuntu2404_sshminion, ' +

diff --git a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV
@@ -10,6 +10,7 @@ node('sumaform-cucumber-provo') {
             'salt_migration_minion, ' +
             'alma8_minion, alma8_sshminion, alma9_minion, alma9_sshminion, ' +
             'centos7_minion, centos7_sshminion, ' +
+            'liberty9_minion, liberty9_sshminion, ' +
             'oracle9_minion, oracle9_sshminion, ' +
             'rocky8_minion, rocky8_sshminion, rocky9_minion, rocky9_sshminion, ' +
             'ubuntu2004_minion, ubuntu2004_sshminion, ubuntu2204_minion, ubuntu2204_sshminion, ubuntu2404_minion, ubuntu2404_sshminion, ' +

diff --git a/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf b/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf
@@ -115,7 +115,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", "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", "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
@@ -406,6 +406,27 @@ module "centos7_minion" {
   install_salt_bundle = true
 }
 
+module "liberty9_minion" {
+  source             = "./modules/minion"
+  base_configuration = module.base_core.configuration
+  product_version    = "uyuni-master"
+  name               = "liberty9-minion"
+  image              = "libertylinux9o"
+  provider_settings = {
+    mac                = "aa:b2:93:02:01:c5"
+    memory             = 4096
+  }
+  server_configuration = {
+    hostname = "uyuni-bv-master-proxy.mgr.suse.de"
+  }
+  auto_connect_to_master  = false
+  use_os_released_updates = false
+  ssh_key_path            = "./salt/controller/id_rsa.pub"
+
+  additional_packages = [ "venv-salt-minion" ]
+  install_salt_bundle = true
+}
+
 module "oracle9_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
@@ -925,6 +946,23 @@ module "centos7_sshminion" {
   install_salt_bundle = true
 }
 
+module "liberty9_sshminion" {
+  source             = "./modules/sshminion"
+  base_configuration = module.base_core.configuration
+  product_version    = "uyuni-master"
+  name               = "liberty9-sshminion"
+  image              = "libertylinux9o"
+  provider_settings = {
+    mac                = "aa:b2:93:02:01:e5"
+    memory             = 4096
+  }
+  use_os_released_updates = false
+  ssh_key_path            = "./salt/controller/id_rsa.pub"
+
+  additional_packages = [ "venv-salt-minion" ]
+  install_salt_bundle = true
+}
+
 module "oracle9_sshminion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_core.configuration
@@ -1338,6 +1376,9 @@ module "controller" {
   centos7_minion_configuration    = module.centos7_minion.configuration
   centos7_sshminion_configuration = module.centos7_sshminion.configuration
 
+  liberty9_minion_configuration    = module.liberty9_minion.configuration
+  liberty9_sshminion_configuration = module.liberty9_sshminion.configuration
+
   oracle9_minion_configuration    = module.oracle9_minion.configuration
   oracle9_sshminion_configuration = module.oracle9_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
@@ -186,7 +186,7 @@ module "base_res" {
   name_prefix = "uyuni-bv-master-"
   use_avahi   = false
   domain      = "mgr.prv.suse.net"
-  images      = [ "almalinux8o", "almalinux9o", "centos7o", "oraclelinux9o", "rocky8o", "rocky9o" ]
+  images      = [ "almalinux8o", "almalinux9o", "centos7o", "libertylinux9o", "oraclelinux9o", "rocky8o", "rocky9o" ]
 
   mirror = "minima-mirror-ci-bv.mgr.prv.suse.net"
   use_mirror_images = true
@@ -581,6 +581,29 @@ module "centos7_minion" {
   install_salt_bundle = true
 }
 
+module "liberty9_minion" {
+  providers = {
+    libvirt = libvirt.cosmopolitan
+  }
+  source             = "./modules/minion"
+  base_configuration = module.base_res.configuration
+  product_version    = "uyuni-master"
+  name               = "liberty9-minion"
+  image              = "libertylinux9o"
+  provider_settings = {
+    mac                = "aa:b2:93:04:05:91"
+    memory             = 4096
+  }
+  server_configuration = {
+    hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net"
+  }
+  auto_connect_to_master  = false
+  use_os_released_updates = false
+  ssh_key_path            = "./salt/controller/id_rsa.pub"
+
+  additional_packages = [ "venv-salt-minion" ]
+  install_salt_bundle = true
+}
 
 module "oracle9_minion" {
   providers = {
@@ -1170,6 +1193,26 @@ module "centos7_sshminion" {
   install_salt_bundle = true
 }
 
+module "liberty9_sshminion" {
+  providers = {
+    libvirt = libvirt.cosmopolitan
+  }
+  source             = "./modules/sshminion"
+  base_configuration = module.base_res.configuration
+  product_version    = "5.0-released"
+  name               = "liberty9-sshminion"
+  image              = "libertylinux9o"
+  provider_settings = {
+    mac                = "aa:b2:93:04:05:b1"
+    memory             = 4096
+  }
+  use_os_released_updates = false
+  ssh_key_path            = "./salt/controller/id_rsa.pub"
+
+  additional_packages = [ "venv-salt-minion" ]
+  install_salt_bundle = true
+}
+
 module "oracle9_sshminion" {
   providers = {
     libvirt = libvirt.cosmopolitan
@@ -1639,6 +1682,9 @@ module "controller" {
   centos7_minion_configuration    = module.centos7_minion.configuration
   centos7_sshminion_configuration = module.centos7_sshminion.configuration
 
+  liberty9_minion_configuration    = module.liberty9_minion.configuration
+  liberty9_sshminion_configuration = module.liberty9_sshminion.configuration
+
   oracle9_minion_configuration    = module.oracle9_minion.configuration
   oracle9_sshminion_configuration = module.oracle9_sshminion.configuration