Revert removal of openSUSE 15.4 ARM

(grace period of 3 months)
SUSE · Jan 29, 2024 · b9393ee · b9393ee
1 parent 94c3837
commit b9393ee
Show file tree

Hide file tree

Showing 14 changed files with 302 additions and 9 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
@@ -14,6 +14,7 @@ node('sumaform-cucumber-provo') {
             '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, ' +
+            '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, ' +
             'slemicro55_minion, slemicro55_ssh_minion, ' +
             'salt_migration_minion'
@@ -61,7 +62,7 @@ node('sumaform-cucumber-provo') {
             string(name: 'key_file', defaultValue: '/home/jenkins/.ssh/testing-suma.pem', description: 'Path to SSH private key to access instance in AWS'),
             string(name: 'key_name', defaultValue: 'testing-suma', description: 'SSH key name in AWS'),
             text(name: 'allowed_IPS', defaultValue: '65.132.116.252', description: 'Add the public IPs to add to AWS ingress security group ( keep default Jenkins address ) separated by new line' ),
-            text(name: 'custom_repositories', defaultValue: '{}', description: 'Salt & Client Tools MU Repositories for each client, in json format')
+            text(name: 'custom_repositories', defaultValue: '{}', description: 'Salt & Client Tools MU Repositories for each client, in json format'),
             booleanParam(name: 'use_latest_ami_image', defaultValue: false, description: 'Use latest ami image')
             ])
     ])

diff --git a/jenkins_pipelines/environments/manager-4.3-qe-build-validation-NUE b/jenkins_pipelines/environments/manager-4.3-qe-build-validation-NUE
@@ -14,6 +14,7 @@ node('sumaform-cucumber') {
             '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, ' +
+            'opensuse154arm_minion, opensuse154arm_ssh_minion, ' +
             'opensuse155arm_minion, opensuse155arm_ssh_minion, ' +
             'sles15sp5s390_minion, sles15sp5s390_ssh_minion, ' +
             'slemicro51_minion, slemicro51_ssh_minion, ' +

diff --git a/jenkins_pipelines/environments/manager-4.3-qe-build-validation-PRV b/jenkins_pipelines/environments/manager-4.3-qe-build-validation-PRV
@@ -14,6 +14,7 @@ node('sumaform-cucumber-provo') {
             '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, ' +
+            'opensuse154arm_minion, opensuse154arm_ssh_minion, ' +
             'opensuse155arm_minion, opensuse155arm_ssh_minion, ' +
             'sles15sp5s390_minion, sles15sp5s390_ssh_minion, ' +
             'slemicro51_minion, slemicro51_ssh_minion, ' +

diff --git a/jenkins_pipelines/environments/manager-5.0-qe-build-validation-NUE b/jenkins_pipelines/environments/manager-5.0-qe-build-validation-NUE
@@ -14,6 +14,7 @@ node('sumaform-cucumber') {
             'rocky8_minion, rocky8_ssh_minion, rocky9_minion, rocky9_ssh_minion, ' +
             'ubuntu2004_minion, ubuntu2004_ssh_minion, ubuntu2204_minion, ubuntu2204_ssh_minion, ' +
             'debian11_minion, debian11_ssh_minion, debian12_minion, debian12_ssh_minion, ' +
+            'opensuse154arm_minion, opensuse154arm_ssh_minion, ' +
             'opensuse155arm_minion, opensuse155arm_ssh_minion, ' +
             'sles15sp5s390_minion, sles15sp5s390_ssh_minion, ' +
             'slemicro51_minion, slemicro51_ssh_minion, ' +

diff --git a/jenkins_pipelines/environments/manager-5.0-qe-build-validation-PRV b/jenkins_pipelines/environments/manager-5.0-qe-build-validation-PRV
@@ -14,6 +14,7 @@ node('sumaform-cucumber') {
             'rocky8_minion, rocky8_ssh_minion, rocky9_minion, rocky9_ssh_minion, ' +
             'ubuntu2004_minion, ubuntu2004_ssh_minion, ubuntu2204_minion, ubuntu2204_ssh_minion, ' +
             'debian11_minion, debian11_ssh_minion, debian12_minion, debian12_ssh_minion, ' +
+            'opensuse154arm_minion, opensuse154arm_ssh_minion, ' +
             'opensuse155arm_minion, opensuse155arm_ssh_minion, ' +
             'sles15sp5s390_minion, sles15sp5s390_ssh_minion, ' +
             'slemicro51_minion, slemicro51_ssh_minion, ' +

diff --git a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE
@@ -13,6 +13,7 @@ node('sumaform-cucumber') {
             '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, ' +
+            'opensuse154arm_minion, opensuse154arm_ssh_minion, ' +
             'opensuse155arm_minion, opensuse155arm_ssh_minion, ' +
             'sles15sp5s390_minion, sles15sp5s390_ssh_minion, ' +
             'slemicro51_minion, slemicro51_ssh_minion, ' +

diff --git a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV
@@ -13,6 +13,7 @@ node('sumaform-cucumber-provo') {
             '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, ' +
+            'opensuse154arm_minion, opensuse154arm_ssh_minion, ' +
             'opensuse155arm_minion, opensuse155arm_ssh_minion, ' +
             'sles15sp5s390_minion, sles15sp5s390_ssh_minion, ' +
             'slemicro51_minion, slemicro51_ssh_minion, ' +

diff --git a/jenkins_pipelines/scripts/maintenance_json_generator.py b/jenkins_pipelines/scripts/maintenance_json_generator.py
@@ -42,8 +42,8 @@
                         "/SUSE_Updates_SLE-Module-Basesystem_15-SP5_x86_64/",
                         "/SUSE_Updates_SLE-Module-Server-Applications_15-SP5_x86_64/"],
     "sles15sp5s390_minion": ["/SUSE_Updates_SLE-Manager-Tools_15_s390x/",
-                        "/SUSE_Updates_SLE-Module-Basesystem_15-SP5_s390x/",
-                        "/SUSE_Updates_SLE-Module-Server-Applications_15-SP5_s390x/"],
+                             "/SUSE_Updates_SLE-Module-Basesystem_15-SP5_s390x/",
+                             "/SUSE_Updates_SLE-Module-Server-Applications_15-SP5_s390x/"],
     "centos7_client": "/SUSE_Updates_RES_7-CLIENT-TOOLS_x86_64/",
     "centos7_minion": "/SUSE_Updates_RES_7-CLIENT-TOOLS_x86_64",
     "rocky8_minion": "/SUSE_Updates_RES_8-CLIENT-TOOLS_x86_64/",
@@ -52,6 +52,8 @@
     "debian10_minion": "/SUSE_Updates_Debian_10-CLIENT-TOOLS_x86_64/",
     "debian11_minion": "/SUSE_Updates_Debian_11-CLIENT-TOOLS_x86_64/",
     "debian12_minion": "/SUSE_Updates_Debian_12-CLIENT-TOOLS_x86_64/",
+    "opensuse154arm_minion": ["/SUSE_Updates_openSUSE-SLE_15.4/",
+                              "/SUSE_Updates_SLE-Manager-Tools_15_aarch64/"],
     "opensuse155arm_minion": ["/SUSE_Updates_openSUSE-SLE_15.5/",
                               "/SUSE_Updates_SLE-Manager-Tools_15_aarch64/"],
     "rhel9_minion": "/SUSE_Updates_EL_9-CLIENT-TOOLS_x86_64/",

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
@@ -143,7 +143,7 @@ module "base_core" {
 //  name_prefix = "suma-bv-43-"
 //  use_avahi   = false
 //  domain      = "mgr.suse.de"
-//  images      = [ "opensuse155armo" ]
+//  images      = [ "opensuse154armo", "opensuse155armo" ]
 //
 //  mirror = "minima-mirror-ci-bv.mgr.suse.de"
 //  use_mirror_images = true
@@ -702,6 +702,30 @@ module "debian12-minion" {
   install_salt_bundle = true
 }
 
+// WORKAROUND: overdrive3 will be replaced with a new ARM server
+//module "opensuse154arm-minion" {
+//  providers = {
+//    libvirt = libvirt.overdrive3
+//  }
+//  source             = "./modules/minion"
+//  base_configuration = module.base_arm.configuration
+//  product_version    = "4.3-released"
+//  name               = "min-opensuse154arm"
+//  image              = "opensuse154armo"
+//  provider_settings = {
+//    mac                = "aa:b2:92:42:00:bf"
+//    memory             = 2048
+//    vcpu               = 2
+//    xslt               = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt")
+//  }
+//  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 will be replaced with a new ARM server
 //module "opensuse155arm-minion" {
 //  providers = {
@@ -1130,6 +1154,26 @@ module "debian12-sshminion" {
   install_salt_bundle = true
 }
 
+// WORKAROUND: overdrive3 will be replaced with a new ARM server
+//module "opensuse154arm-sshminion" {
+//  providers = {
+//    libvirt = libvirt.overdrive3
+//  }
+//  source             = "./modules/sshminion"
+//  base_configuration = module.base_arm.configuration
+//  product_version    = "4.3-released"
+//  name               = "minssh-opensuse154arm"
+//  image              = "opensuse154armo"
+//  provider_settings = {
+//    mac                = "aa:b2:92:42:00:df"
+//    memory             = 2048
+//    vcpu               = 2
+//    xslt               = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt")
+//  }
+//  use_os_released_updates = false
+//  ssh_key_path            = "./salt/controller/id_rsa.pub"
+//}
+
 // WORKAROUND: overdrive3 will be replaced with a new ARM server
 //module "opensuse155arm-sshminion" {
 //  providers = {
@@ -1401,6 +1445,9 @@ module "controller" {
   debian12_sshminion_configuration = module.debian12-sshminion.configuration
 
 // WORKAROUND: overdrive3 will be replaced with a new ARM server
+//  opensuse154arm_minion_configuration    = module.opensuse154arm-minion.configuration
+//  opensuse154arm_sshminion_configuration = module.opensuse154arm-sshminion.configuration
+//
 //  opensuse155arm_minion_configuration    = module.opensuse155arm-minion.configuration
 //  opensuse155arm_sshminion_configuration = module.opensuse155arm-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
@@ -289,7 +289,7 @@ module "base_debian" {
 //  name_prefix = "suma-bv-43-"
 //  use_avahi   = false
 //  domain      = "mgr.prv.suse.net"
-//  images      = [ "opensuse155armo" ]
+//  images      = [ "opensuse154armo", "opensuse155armo" ]
 //
 //  mirror = "minima-mirror-ci-bv.mgr.prv.suse.net"
 //  use_mirror_images = true
@@ -923,6 +923,30 @@ module "debian12-minion" {
   install_salt_bundle = true
 }
 
+// WORKAROUND: overdrive4 will be replaced with a new ARM server
+//module "opensuse154arm-minion" {
+//  providers = {
+//    libvirt = libvirt.overdrive4
+//  }
+//  source             = "./modules/minion"
+//  base_configuration = module.base_arm.configuration
+//  product_version    = "4.3-released"
+//  name               = "min-opensuse154arm"
+//  image              = "opensuse154armo"
+//  provider_settings = {
+//    mac                = "aa:b2:93:02:01:f0"
+//    memory             = 2048
+//    vcpu               = 2
+//    xslt               = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt")
+//  }
+//  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"
+//}
+
 // WORKAROUND: overdrive4 will be replaced with a new ARM server
 //module "opensuse155arm-minion" {
 //  providers = {
@@ -1417,6 +1441,26 @@ module "debian12-sshminion" {
   install_salt_bundle = true
 }
 
+// WORKAROUND: overdrive4 will be replaced with a new ARM server
+//module "opensuse154arm-sshminion" {
+//  providers = {
+//    libvirt = libvirt.overdrive4
+//  }
+//  source             = "./modules/sshminion"
+//  base_configuration = module.base_arm.configuration
+//  product_version    = "4.3-released"
+//  name               = "minssh-opensuse154arm"
+//  image              = "opensuse154armo"
+//  provider_settings = {
+//    mac                = "aa:b2:93:02:01:f3"
+//    memory             = 2048
+//    vcpu               = 2
+//    xslt               = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt")
+//  }
+//  use_os_released_updates = false
+//  ssh_key_path            = "./salt/controller/id_rsa.pub"
+//}
+
 // WORKAROUND: overdrive4 will be replaced with a new ARM server
 //module "opensuse155arm-sshminion" {
 //  providers = {
@@ -1718,6 +1762,9 @@ module "controller" {
   debian12_sshminion_configuration = module.debian12-sshminion.configuration
 
 // WORKAROUND: overdrive4 will be replaced with a new ARM server
+//  opensuse154arm_minion_configuration    = module.opensuse154arm-minion.configuration
+//  opensuse154arm_sshminion_configuration = module.opensuse154arm-sshminion.configuration
+//
 //  opensuse155arm_minion_configuration    = module.opensuse155arm-minion.configuration
 //  opensuse155arm_sshminion_configuration = module.opensuse155arm-sshminion.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
@@ -143,7 +143,7 @@ module "base_core" {
 //  name_prefix = "suma-bv-50-"
 //  use_avahi   = false
 //  domain      = "mgr.suse.de"
-//  images      = [ "opensuse155armo" ]
+//  images      = [ "opensuse154armo", "opensuse155armo" ]
 //
 //  mirror = "minima-mirror-ci-bv.mgr.suse.de"
 //  use_mirror_images = true
@@ -546,6 +546,30 @@ module "debian12-minion" {
   install_salt_bundle = true
 }
 
+// WORKAROUND: overdrive3 will be replaced with a new ARM server
+//module "opensuse154arm-minion" {
+//  providers = {
+//    libvirt = libvirt.overdrive3
+//  }
+//  source             = "./modules/minion"
+//  base_configuration = module.base_arm.configuration
+//  product_version    = "head"
+//  name               = "min-o154arm-n"
+//  image              = "opensuse154armo"
+//  provider_settings = {
+//    mac                = "aa:b2:92:42:00:6f"
+//    memory             = 2048
+//    vcpu               = 2
+//    xslt               = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt")
+//  }
+//  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"
+//}
+
 // WORKAROUND: overdrive3 will be replaced with a new ARM server
 //module "opensuse155arm-minion" {
 //  providers = {
@@ -935,6 +959,26 @@ module "debian12-sshminion" {
   install_salt_bundle = true
 }
 
+// WORKAROUND: overdrive3 will be replaced with a new ARM server
+//module "opensuse154arm-sshminion" {
+//  providers = {
+//    libvirt = libvirt.overdrive3
+//  }
+//  source             = "./modules/sshminion"
+//  base_configuration = module.base_arm.configuration
+//  product_version    = "head"
+//  name               = "minssh-o154arm-n"
+//  image              = "opensuse154armo"
+//  provider_settings = {
+//    mac                = "aa:b2:92:42:00:8f"
+//    memory             = 2048
+//    vcpu               = 2
+//    xslt               = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt")
+//  }
+//  use_os_released_updates = false
+//  ssh_key_path            = "./salt/controller/id_rsa.pub"
+//}
+
 // WORKAROUND: overdrive3 will be replaced with a new ARM server
 //module "opensuse155arm-sshminion" {
 //  providers = {
@@ -1197,6 +1241,9 @@ module "controller" {
   debian12_sshminion_configuration = module.debian12-sshminion.configuration
 
 // WORKAROUND: overdrive3 will be replaced with a new ARM server
+//  opensuse154arm_minion_configuration    = module.opensuse154arm-minion.configuration
+//  opensuse154arm_sshminion_configuration = module.opensuse154arm-sshminion.configuration
+//
 //  opensuse155arm_minion_configuration    = module.opensuse155arm-minion.configuration
 //  opensuse155arm_sshminion_configuration = module.opensuse155arm-sshminion.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
@@ -289,7 +289,7 @@ module "base_debian" {
 //  name_prefix = "suma-bv-50"
 //  use_avahi   = false
 //  domain      = "mgr.prv.suse.net"
-//  images      = [ "opensuse155armo" ]
+//  images      = [ "opensuse154armo", "opensuse155armo" ]
 //
 //  mirror = "minima-mirror-ci-bv.mgr.prv.suse.net"
 //  use_mirror_images = true
@@ -742,6 +742,31 @@ module "debian12-minion" {
   install_salt_bundle = true
 }
 
+// WORKAROUND: overdrive3 will be replaced with a new ARM server
+// TODO: Please adjust the values below!
+//module "opensuse154arm-minion" {
+//  providers = {
+//    libvirt = libvirt.overdrive3
+//  }
+//  source             = "./modules/minion"
+//  base_configuration = module.base_arm.configuration
+//  product_version    = "head"
+//  name               = "min-o154arm-n"
+//  image              = "opensuse154armo"
+//  provider_settings = {
+//    mac                = "aa:b2:92:42:00:6f"
+//    memory             = 2048
+//    vcpu               = 2
+//    xslt               = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt")
+//  }
+//  server_configuration = {
+//    hostname = "suma-bv-50-srv.mgr.prv.suse.net"
+//  }
+//  auto_connect_to_master  = false
+//  use_os_released_updates = false
+//  ssh_key_path            = "./salt/controller/id_rsa.pub"
+//}
+
 // WORKAROUND: overdrive3 will be replaced with a new ARM server
 // TODO: Please adjust the values below!
 //module "opensuse155arm-minion" {
@@ -1195,6 +1220,27 @@ module "debian12-sshminion" {
   install_salt_bundle = true
 }
 
+// WORKAROUND: overdrive3 will be replaced with a new ARM server
+// TODO: Please adjust the values below!
+//module "opensuse154arm-sshminion" {
+//  providers = {
+//    libvirt = libvirt.overdrive3
+//  }
+//  source             = "./modules/sshminion"
+//  base_configuration = module.base_arm.configuration
+//  product_version    = "head"
+//  name               = "minssh-o154arm-n"
+//  image              = "opensuse154armo"
+//  provider_settings = {
+//    mac                = "aa:b2:92:42:00:8f"
+//    memory             = 2048
+//    vcpu               = 2
+//    xslt               = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt")
+//  }
+//  use_os_released_updates = false
+//  ssh_key_path            = "./salt/controller/id_rsa.pub"
+//}
+
 // WORKAROUND: overdrive3 will be replaced with a new ARM server
 // TODO: Please adjust the values below!
 //module "opensuse155arm-sshminion" {
@@ -1488,6 +1534,9 @@ module "controller" {
   debian12_sshminion_configuration = module.debian12-sshminion.configuration
 
 // WORKAROUND: overdrive3 will be replaced with a new ARM server
+//  opensuse154arm_minion_configuration    = module.opensuse154arm-minion.configuration
+//  opensuse154arm_sshminion_configuration = module.opensuse154arm-sshminion.configuration
+//
 //  opensuse155arm_minion_configuration    = module.opensuse155arm-minion.configuration
 //  opensuse155arm_sshminion_configuration = module.opensuse155arm-sshminion.configuration