Remove Debian 10 and SLE 15 SP1

SUSE · Aug 7, 2024 · 2cd81ea · 2cd81ea
1 parent fe91a04
commit 2cd81ea
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 412 deletions.
diff --git a/jenkins_pipelines/environments/manager-4.3-qe-build-validation-AWS b/jenkins_pipelines/environments/manager-4.3-qe-build-validation-AWS
@@ -2,7 +2,6 @@
 
 node('sumaform-cucumber-provo') {
     def minionList = 'sle12sp5_client, sle12sp5_minion, sle12sp5_ssh_minion, sle12sp5_paygo_minion, ' +
-            'sle15sp1_client, sle15sp1_minion, sle15sp1_ssh_minion, ' +
             'sle15sp2_client, sle15sp2_minion, sle15sp2_ssh_minion, ' +
             'sle15sp3_client, sle15sp3_minion, sle15sp3_ssh_minion, ' +
             'sle15sp4_client, sle15sp4_minion, sle15sp4_ssh_minion, sle15sp4_byos_minion, ' +
@@ -15,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, debian12_minion, debian12_ssh_minion, ' +
+            'debian11_minion, debian11_ssh_minion, debian12_minion, debian12_ssh_minion, ' +
             'opensuse154arm_minion, opensuse154arm_ssh_minion, ' +
             'opensuse155arm_minion, opensuse155arm_ssh_minion, ' +
             'opensuse156arm_minion, opensuse156arm_ssh_minion, ' +

diff --git a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE
@@ -2,7 +2,6 @@
 
 node('sumaform-cucumber') {
     def minionList = 'sle12sp5_minion, sle12sp5_ssh_minion, ' +
-            'sle15sp1_minion, sle15sp1_ssh_minion, ' +
             'sle15sp2_minion, sle15sp2_ssh_minion, ' +
             'sle15sp3_minion, sle15sp3_ssh_minion, ' +
             'sle15sp4_minion, sle15sp4_ssh_minion, ' +
@@ -13,7 +12,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, debian12_minion, debian12_ssh_minion, ' +
+            'debian11_minion, debian11_ssh_minion, debian12_minion, debian12_ssh_minion, ' +
             'opensuse154arm_minion, opensuse154arm_ssh_minion, ' +
             'opensuse155arm_minion, opensuse155arm_ssh_minion, ' +
             'opensuse156arm_minion, opensuse156arm_ssh_minion, ' +

diff --git a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV
@@ -2,7 +2,6 @@
 
 node('sumaform-cucumber-provo') {
     def minionList = 'sle12sp5_minion, sle12sp5_ssh_minion, ' +
-            'sle15sp1_minion, sle15sp1_ssh_minion, ' +
             'sle15sp2_minion, sle15sp2_ssh_minion, ' +
             'sle15sp3_minion, sle15sp3_ssh_minion, ' +
             'sle15sp4_minion, sle15sp4_ssh_minion, ' +
@@ -13,7 +12,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, debian12_minion, debian12_ssh_minion, ' +
+            'debian11_minion, debian11_ssh_minion, debian12_minion, debian12_ssh_minion, ' +
             'opensuse154arm_minion, opensuse154arm_ssh_minion, ' +
             'opensuse155arm_minion, opensuse155arm_ssh_minion, ' +
             'opensuse156arm_minion, opensuse156arm_ssh_minion, ' +

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
@@ -115,7 +115,7 @@ module "base_core" {
   name_prefix = "suma-bv-43-"
   use_avahi   = false
   domain      = "mgr.suse.de"
-  images      = [ "sles12sp5o", "sles15sp1o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign", "slemicro54-ign", "slemicro55o", "slmicro60o", "almalinux8o", "almalinux9o", "centos7o", "libertylinux9o", "oraclelinux9o", "rocky8o", "rocky9o", "ubuntu2004o", "ubuntu2204o", "debian11o", "debian12o", "opensuse155o", "opensuse156o" ]
+  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", "debian11o", "debian12o", "opensuse155o", "opensuse156o" ]
 
   mirror = "minima-mirror-ci-bv.mgr.suse.de"
   use_mirror_images = true
@@ -246,24 +246,6 @@ module "sles12sp5-client" {
   ssh_key_path            = "./salt/controller/id_rsa.pub"
 }
 
-module "sles15sp1-client" {
-  source             = "./modules/client"
-  base_configuration = module.base_core.configuration
-  product_version    = "4.3-released"
-  name               = "cli-sles15sp1"
-  image              = "sles15sp1o"
-  provider_settings = {
-    mac                = "aa:b2:92:42:00:ab"
-    memory             = 4096
-  }
-  server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
-  }
-  auto_register           = false
-  use_os_released_updates = false
-  ssh_key_path            = "./salt/controller/id_rsa.pub"
-}
-
 module "sles15sp2-client" {
   source             = "./modules/client"
   base_configuration = module.base_core.configuration
@@ -393,25 +375,6 @@ module "sles12sp5-minion" {
   ssh_key_path            = "./salt/controller/id_rsa.pub"
 }
 
-module "sles15sp1-minion" {
-  source             = "./modules/minion"
-  base_configuration = module.base_core.configuration
-  product_version    = "4.3-released"
-  name               = "min-sles15sp1"
-  image              = "sles15sp1o"
-  provider_settings = {
-    mac                = "aa:b2:92:42:00:b3"
-    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"
-}
-
 module "sles15sp2-minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
@@ -695,8 +658,6 @@ module "ubuntu2204-minion" {
   ssh_key_path            = "./salt/controller/id_rsa.pub"
 }
 
-// Debian 9 and 10 are not supported by 4.3
-
 module "debian11-minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
@@ -1001,21 +962,6 @@ module "sles12sp5-sshminion" {
   gpg_keys                = ["default/gpg_keys/galaxy.key"]
 }
 
-module "sles15sp1-sshminion" {
-  source             = "./modules/sshminion"
-  base_configuration = module.base_core.configuration
-  product_version    = "4.3-released"
-  name               = "minssh-sles15sp1"
-  image              = "sles15sp1o"
-  provider_settings = {
-    mac                = "aa:b2:92:42:00:d3"
-    memory             = 4096
-  }
-  use_os_released_updates = false
-  ssh_key_path            = "./salt/controller/id_rsa.pub"
-
-}
-
 module "sles15sp2-sshminion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_core.configuration
@@ -1238,8 +1184,6 @@ module "ubuntu2204-sshminion" {
   ssh_key_path            = "./salt/controller/id_rsa.pub"
 }
 
-// Debian 9 and 10 are not supported by 4.3
-
 module "debian11-sshminion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_core.configuration
@@ -1551,10 +1495,6 @@ module "controller" {
   sle12sp5_minion_configuration    = module.sles12sp5-minion.configuration
   sle12sp5_sshminion_configuration = module.sles12sp5-sshminion.configuration
 
-  sle15sp1_client_configuration    = module.sles15sp1-client.configuration
-  sle15sp1_minion_configuration    = module.sles15sp1-minion.configuration
-  sle15sp1_sshminion_configuration = module.sles15sp1-sshminion.configuration
-
   sle15sp2_client_configuration    = module.sles15sp2-client.configuration
   sle15sp2_minion_configuration    = module.sles15sp2-minion.configuration
   sle15sp2_sshminion_configuration = module.sles15sp2-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
@@ -211,7 +211,7 @@ module "base_new_sle" {
   name_prefix = "suma-bv-43-"
   use_avahi   = false
   domain      = "mgr.prv.suse.net"
-  images      = [ "sles15sp1o", "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" ]
 
   mirror = "minima-mirror-ci-bv.mgr.prv.suse.net"
   use_mirror_images = true
@@ -398,27 +398,6 @@ module "sles12sp5-client" {
   ssh_key_path            = "./salt/controller/id_rsa.pub"
 }
 
-module "sles15sp1-client" {
-  providers = {
-    libvirt = libvirt.moscowmule
-  }
-  source             = "./modules/client"
-  base_configuration = module.base_new_sle.configuration
-  product_version    = "4.3-released"
-  name               = "cli-sles15sp1"
-  image              = "sles15sp1o"
-  provider_settings = {
-    mac                = "aa:b2:92:05:00:ab"
-    memory             = 4096
-  }
-  server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.prv.suse.net"
-  }
-  auto_register           = false
-  use_os_released_updates = false
-  ssh_key_path            = "./salt/controller/id_rsa.pub"
-}
-
 module "sles15sp2-client" {
   providers = {
     libvirt = libvirt.moscowmule
@@ -569,28 +548,6 @@ module "sles12sp5-minion" {
   ssh_key_path            = "./salt/controller/id_rsa.pub"
 }
 
-module "sles15sp1-minion" {
-  providers = {
-    libvirt = libvirt.moscowmule
-  }
-  source             = "./modules/minion"
-  base_configuration = module.base_new_sle.configuration
-  product_version    = "4.3-released"
-  name               = "min-sles15sp1"
-  image              = "sles15sp1o"
-  provider_settings = {
-    mac                = "aa:b2:92:05:00:b3"
-    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 "sles15sp2-minion" {
   providers = {
     libvirt = libvirt.moscowmule
@@ -915,8 +872,6 @@ module "ubuntu2204-minion" {
   ssh_key_path            = "./salt/controller/id_rsa.pub"
 }
 
-// Debian 9 and 10 are not supported by 4.3
-
 module "debian11-minion" {
   providers = {
     libvirt = libvirt.mandalore
@@ -1251,24 +1206,6 @@ module "sles12sp5-sshminion" {
   gpg_keys                = ["default/gpg_keys/galaxy.key"]
 }
 
-module "sles15sp1-sshminion" {
-  providers = {
-    libvirt = libvirt.moscowmule
-  }
-  source             = "./modules/sshminion"
-  base_configuration = module.base_new_sle.configuration
-  product_version    = "4.3-released"
-  name               = "minssh-sles15sp1"
-  image              = "sles15sp1o"
-  provider_settings = {
-    mac                = "aa:b2:92:05:00:d3"
-    memory             = 4096
-  }
-  use_os_released_updates = false
-  ssh_key_path            = "./salt/controller/id_rsa.pub"
-
-}
-
 module "sles15sp2-sshminion" {
   providers = {
     libvirt = libvirt.moscowmule
@@ -1532,8 +1469,6 @@ module "ubuntu2204-sshminion" {
   ssh_key_path            = "./salt/controller/id_rsa.pub"
 }
 
-// Debian 9 and 10 are not supported by 4.3
-
 module "debian11-sshminion" {
   providers = {
     libvirt = libvirt.mandalore
@@ -1884,10 +1819,6 @@ module "controller" {
   sle12sp5_minion_configuration    = module.sles12sp5-minion.configuration
   sle12sp5_sshminion_configuration = module.sles12sp5-sshminion.configuration
 
-  sle15sp1_client_configuration    = module.sles15sp1-client.configuration
-  sle15sp1_minion_configuration    = module.sles15sp1-minion.configuration
-  sle15sp1_sshminion_configuration = module.sles15sp1-sshminion.configuration
-
   sle15sp2_client_configuration    = module.sles15sp2-client.configuration
   sle15sp2_minion_configuration    = module.sles15sp2-minion.configuration
   sle15sp2_sshminion_configuration = module.sles15sp2-sshminion.configuration

diff --git a/terracumber_config/tf_files/SUSEManager-4.3-refenv-PRV.tf b/terracumber_config/tf_files/SUSEManager-4.3-refenv-PRV.tf
@@ -91,7 +91,7 @@ module "base" {
   name_prefix       = "suma-ref43-"
   use_avahi         = false
   domain            = "mgr.prv.suse.net"
-  images            = ["centos7o", "sles15sp1o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "ubuntu2204o"]
+  images            = ["centos7o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "ubuntu2204o"]
   mirror            = "minima-mirror-ci-bv.mgr.prv.suse.net"
   use_mirror_images = true
 

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
@@ -115,7 +115,7 @@ module "base_core" {
   name_prefix = "suma-bv-50-"
   use_avahi   = false
   domain      = "mgr.suse.de"
-  images      = [ "sles12sp5o", "sles15sp1o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign", "slemicro54-ign", "slemicro55o", "slmicro60o", "almalinux8o", "almalinux9o", "centos7o", "libertylinux9o", "oraclelinux9o", "rocky8o", "rocky9o", "ubuntu2004o", "ubuntu2204o", "debian11o", "debian12o", "opensuse155o", "opensuse156armo" ]
+  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", "debian11o", "debian12o", "opensuse155o", "opensuse156armo" ]
 
   mirror = "minima-mirror-ci-bv.mgr.suse.de"
   use_mirror_images = true
@@ -243,28 +243,6 @@ module "sles12sp5-minion" {
   install_salt_bundle = true
 }
 
-module "sles15sp1-minion" {
-  source             = "./modules/minion"
-  base_configuration = module.base_core.configuration
-  product_version    = "5.0-released"
-  name               = "min-sles15sp1"
-  image              = "sles15sp1o"
-  provider_settings = {
-    mac                = "aa:b2:92:42:00:63"
-    memory             = 4096
-  }
-
-  server_configuration = {
-    hostname = "suma-bv-50-srv.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 "sles15sp2-minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
@@ -890,23 +868,6 @@ module "sles12sp5-sshminion" {
   install_salt_bundle = true
 }
 
-module "sles15sp1-sshminion" {
-  source             = "./modules/sshminion"
-  base_configuration = module.base_core.configuration
-  product_version    = "5.0-released"
-  name               = "minssh-sles15sp1"
-  image              = "sles15sp1o"
-  provider_settings = {
-    mac                = "aa:b2:92:42:00:83"
-    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 "sles15sp2-sshminion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_core.configuration
@@ -1514,9 +1475,6 @@ module "controller" {
   sle12sp5_minion_configuration    = module.sles12sp5-minion.configuration
   sle12sp5_sshminion_configuration = module.sles12sp5-sshminion.configuration
 
-  sle15sp1_minion_configuration    = module.sles15sp1-minion.configuration
-  sle15sp1_sshminion_configuration = module.sles15sp1-sshminion.configuration
-
   sle15sp2_minion_configuration    = module.sles15sp2-minion.configuration
   sle15sp2_sshminion_configuration = module.sles15sp2-sshminion.configuration