From 8ab04bcb5898727b56403ad6972f20090e2c37fe Mon Sep 17 00:00:00 2001 From: Dominik Gedon Date: Mon, 9 Sep 2024 16:08:59 +0200 Subject: [PATCH] Remove openSUSE Leap 15.4 due to EOL Signed-off-by: Dominik Gedon --- .../manager-4.3-qe-build-validation-AWS | 1 - .../manager-4.3-qe-build-validation-NUE | 1 - .../manager-4.3-qe-build-validation-PRV | 1 - .../manager-5.0-qe-build-validation-NUE | 1 - .../manager-5.0-qe-build-validation-PRV | 1 - .../uyuni-master-qe-build-validation-NUE | 1 - .../uyuni-master-qe-build-validation-PRV | 1 - .../SUSEManager-4.3-build-validation-NUE.tf | 49 +---------------- .../SUSEManager-4.3-build-validation-PRV.tf | 49 +---------------- .../SUSEManager-5.0-build-validation-NUE.tf | 55 +------------------ .../SUSEManager-5.0-build-validation-PRV.tf | 55 +------------------ .../Uyuni-Master-build-validation-NUE.tf | 49 +---------------- .../Uyuni-Master-build-validation-PRV.tf | 49 +---------------- 13 files changed, 6 insertions(+), 307 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 index cd20f7fda..a9b46d8c1 100644 --- a/jenkins_pipelines/environments/manager-4.3-qe-build-validation-AWS +++ b/jenkins_pipelines/environments/manager-4.3-qe-build-validation-AWS @@ -15,7 +15,6 @@ node('sumaform-cucumber-provo') { '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, ' + 'opensuse156arm_minion, opensuse156arm_ssh_minion, ' + 'slemicro51_minion, slemicro52_minion, slemicro53_minion, slemicro54_minion, slemicro55_minion, slmicro60_minion' diff --git a/jenkins_pipelines/environments/manager-4.3-qe-build-validation-NUE b/jenkins_pipelines/environments/manager-4.3-qe-build-validation-NUE index c6f1b57e5..7ee716222 100644 --- a/jenkins_pipelines/environments/manager-4.3-qe-build-validation-NUE +++ b/jenkins_pipelines/environments/manager-4.3-qe-build-validation-NUE @@ -15,7 +15,6 @@ 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, ' + 'opensuse156arm_minion, opensuse156arm_ssh_minion, ' + 'sle15sp5s390_minion, sle15sp5s390_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 index 2e72bd92b..5002d2cce 100644 --- a/jenkins_pipelines/environments/manager-4.3-qe-build-validation-PRV +++ b/jenkins_pipelines/environments/manager-4.3-qe-build-validation-PRV @@ -15,7 +15,6 @@ node('sumaform-cucumber-provo') { '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, ' + 'opensuse156arm_minion, opensuse156arm_ssh_minion, ' + 'sle15sp5s390_minion, sle15sp5s390_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 index 365519742..31316e28b 100644 --- a/jenkins_pipelines/environments/manager-5.0-qe-build-validation-NUE +++ b/jenkins_pipelines/environments/manager-5.0-qe-build-validation-NUE @@ -15,7 +15,6 @@ 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, ' + 'opensuse156arm_minion, opensuse156arm_ssh_minion, ' + 'sle15sp5s390_minion, sle15sp5s390_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 index f85f8e7c5..3d3cf2901 100644 --- a/jenkins_pipelines/environments/manager-5.0-qe-build-validation-PRV +++ b/jenkins_pipelines/environments/manager-5.0-qe-build-validation-PRV @@ -15,7 +15,6 @@ node('sumaform-cucumber-provo') { '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, ' + 'opensuse156arm_minion, opensuse156arm_ssh_minion, ' + 'sle15sp5s390_minion, sle15sp5s390_ssh_minion, ' + diff --git a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE index 8f45f95a9..5db16df59 100644 --- a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE +++ b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE @@ -14,7 +14,6 @@ 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, ' + 'opensuse156arm_minion, opensuse156arm_ssh_minion, ' + 'sle15sp5s390_minion, sle15sp5s390_ssh_minion, ' + diff --git a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV index f4c797c6a..eb2b4fda0 100644 --- a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV +++ b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV @@ -14,7 +14,6 @@ node('sumaform-cucumber-provo') { '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, ' + 'opensuse156arm_minion, opensuse156arm_ssh_minion, ' + 'sle15sp5s390_minion, sle15sp5s390_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 index cafdb2d03..4c52d8568 100644 --- a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf +++ b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf @@ -141,7 +141,7 @@ module "base_arm" { name_prefix = "suma-bv-43-" use_avahi = false domain = "mgr.suse.de" - images = [ "opensuse154armo", "opensuse155armo", "opensuse156armo" ] + images = [ "opensuse155armo", "opensuse156armo" ] mirror = "minima-mirror-ci-bv.mgr.suse.de" use_mirror_images = true @@ -699,30 +699,6 @@ module "debian12_minion" { install_salt_bundle = true } -module "opensuse154arm_minion" { - providers = { - libvirt = libvirt.suma-arm - } - source = "./modules/minion" - base_configuration = module.base_arm.configuration - product_version = "4.3-released" - name = "nue-min-opensuse154arm" - image = "opensuse154armo" - provider_settings = { - mac = "aa:b2:92:42:00:bf" - overwrite_fqdn = "suma-bv-43-min-opensuse154arm.mgr.suse.de" - 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" -} - module "opensuse155arm_minion" { providers = { libvirt = libvirt.suma-arm @@ -1215,26 +1191,6 @@ module "debian12_ssh_minion" { install_salt_bundle = true } -module "opensuse154arm_ssh_minion" { - providers = { - libvirt = libvirt.suma-arm - } - source = "./modules/sshminion" - base_configuration = module.base_arm.configuration - product_version = "4.3-released" - name = "nue-minssh-opensuse154arm" - image = "opensuse154armo" - provider_settings = { - mac = "aa:b2:92:42:00:df" - overwrite_fqdn = "suma-bv-43-minssh-opensuse154arm.mgr.suse.de" - 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" -} - module "opensuse155arm_ssh_minion" { providers = { libvirt = libvirt.suma-arm @@ -1550,9 +1506,6 @@ module "controller" { debian12_minion_configuration = module.debian12_minion.configuration debian12_sshminion_configuration = module.debian12_ssh_minion.configuration - opensuse154arm_minion_configuration = module.opensuse154arm_minion.configuration - opensuse154arm_sshminion_configuration = module.opensuse154arm_ssh_minion.configuration - opensuse155arm_minion_configuration = module.opensuse155arm_minion.configuration opensuse155arm_sshminion_configuration = module.opensuse155arm_ssh_minion.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 index e27115e9f..939b9e70d 100644 --- a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf +++ b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf @@ -287,7 +287,7 @@ module "base_arm" { name_prefix = "suma-bv-43-" use_avahi = false domain = "mgr.prv.suse.net" - images = [ "opensuse154armo", "opensuse155armo", "opensuse156armo" ] + images = [ "opensuse155armo", "opensuse156armo" ] mirror = "minima-mirror-ci-bv.mgr.prv.suse.net" use_mirror_images = true @@ -919,30 +919,6 @@ module "debian12_minion" { install_salt_bundle = true } -module "opensuse154arm_minion" { - providers = { - libvirt = libvirt.suma-arm - } - source = "./modules/minion" - base_configuration = module.base_arm.configuration - product_version = "4.3-released" - name = "prv-min-opensuse154arm" - image = "opensuse154armo" - provider_settings = { - mac = "aa:b2:92:42:00:00" - overwrite_fqdn = "suma-bv-43-min-opensuse154arm.mgr.prv.suse.net" - 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" -} - module "opensuse155arm_minion" { providers = { libvirt = libvirt.suma-arm @@ -1507,26 +1483,6 @@ module "debian12_ssh_minion" { install_salt_bundle = true } -module "opensuse154arm_ssh_minion" { - providers = { - libvirt = libvirt.suma-arm - } - source = "./modules/sshminion" - base_configuration = module.base_arm.configuration - product_version = "4.3-released" - name = "prv-minssh-opensuse154arm" - image = "opensuse154armo" - provider_settings = { - mac = "aa:b2:92:42:00:01" - overwrite_fqdn = "suma-bv-43-minssh-opensuse154arm.mgr.prv.suse.net" - 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" -} - module "opensuse155arm_ssh_minion" { providers = { libvirt = libvirt.suma-arm @@ -1875,9 +1831,6 @@ module "controller" { debian12_minion_configuration = module.debian12_minion.configuration debian12_sshminion_configuration = module.debian12_ssh_minion.configuration - opensuse154arm_minion_configuration = module.opensuse154arm_minion.configuration - opensuse154arm_sshminion_configuration = module.opensuse154arm_ssh_minion.configuration - opensuse155arm_minion_configuration = module.opensuse155arm_minion.configuration opensuse155arm_sshminion_configuration = module.opensuse155arm_ssh_minion.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 index c71f2ef7b..52fa4f249 100644 --- a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf +++ b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf @@ -141,7 +141,7 @@ module "base_arm" { name_prefix = "suma-bv-50-" use_avahi = false domain = "mgr.suse.de" - images = [ "opensuse154armo", "opensuse155armo", "opensuse156armo" ] + images = [ "opensuse155armo", "opensuse156armo" ] mirror = "minima-mirror-ci-bv.mgr.suse.de" use_mirror_images = true @@ -585,33 +585,6 @@ module "debian12-minion" { install_salt_bundle = true } -module "opensuse154arm-minion" { - providers = { - libvirt = libvirt.suma-arm - } - source = "./modules/minion" - base_configuration = module.base_arm.configuration - product_version = "5.0-released" - name = "nue-min-opensuse154arm" - image = "opensuse154armo" - provider_settings = { - mac = "aa:b2:92:42:00:6f" - overwrite_fqdn = "suma-bv-50-min-opensuse154arm.mgr.suse.de" - 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" - - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true -} - module "opensuse155arm-minion" { providers = { libvirt = libvirt.suma-arm @@ -1141,29 +1114,6 @@ module "debian12-sshminion" { install_salt_bundle = true } -module "opensuse154arm-sshminion" { - providers = { - libvirt = libvirt.suma-arm - } - source = "./modules/sshminion" - base_configuration = module.base_arm.configuration - product_version = "5.0-released" - name = "nue-minssh-opensuse154arm" - image = "opensuse154armo" - provider_settings = { - mac = "aa:b2:92:42:00:8f" - overwrite_fqdn = "suma-bv-50-minssh-opensuse154arm.mgr.suse.de" - 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" - - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true -} - module "opensuse155arm-sshminion" { providers = { libvirt = libvirt.suma-arm @@ -1523,9 +1473,6 @@ module "controller" { 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 - 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 index c5758f60c..411d0a0b1 100644 --- a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf +++ b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf @@ -287,7 +287,7 @@ module "base_arm" { name_prefix = "suma-bv-50-" use_avahi = false domain = "mgr.prv.suse.net" - images = [ "opensuse154armo", "opensuse155armo", "opensuse156armo" ] + images = [ "opensuse155armo", "opensuse156armo" ] mirror = "minima-mirror-ci-bv.mgr.prv.suse.net" use_mirror_images = true @@ -785,33 +785,6 @@ module "debian12_minion" { install_salt_bundle = true } -module "opensuse154arm_minion" { - providers = { - libvirt = libvirt.suma-arm - } - source = "./modules/minion" - base_configuration = module.base_arm.configuration - product_version = "5.0-released" - name = "prv-min-opensuse154arm" - image = "opensuse154armo" - provider_settings = { - mac = "aa:b2:92:42:00:06" - overwrite_fqdn = "suma-bv-50-min-opensuse154arm.mgr.prv.suse.net" - 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" - - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true -} - module "opensuse155arm_minion" { providers = { libvirt = libvirt.suma-arm @@ -1410,29 +1383,6 @@ module "debian12_ssh_minion" { install_salt_bundle = true } -module "opensuse154arm_ssh_minion" { - providers = { - libvirt = libvirt.suma-arm - } - source = "./modules/sshminion" - base_configuration = module.base_arm.configuration - product_version = "5.0-released" - name = "prv-minssh-opensuse154arm" - image = "opensuse154armo" - provider_settings = { - mac = "aa:b2:92:42:00:07" - overwrite_fqdn = "suma-bv-50-minssh-opensuse154arm.mgr.prv.suse.net" - 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" - - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true -} - module "opensuse155arm_ssh_minion" { providers = { libvirt = libvirt.suma-arm @@ -1827,9 +1777,6 @@ module "controller" { debian12_minion_configuration = module.debian12_minion.configuration debian12_sshminion_configuration = module.debian12_ssh_minion.configuration - opensuse154arm_minion_configuration = module.opensuse154arm_minion.configuration - opensuse154arm_sshminion_configuration = module.opensuse154arm_ssh_minion.configuration - opensuse155arm_minion_configuration = module.opensuse155arm_minion.configuration opensuse155arm_sshminion_configuration = module.opensuse155arm_ssh_minion.configuration diff --git a/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf b/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf index a67eda47c..91f3b7a6e 100644 --- a/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf +++ b/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf @@ -141,7 +141,7 @@ module "base_arm" { name_prefix = "uyuni-bv-master-" use_avahi = false domain = "mgr.suse.de" - images = [ "opensuse154armo", "opensuse155armo", "opensuse156armo" ] + images = [ "opensuse155armo", "opensuse156armo" ] mirror = "minima-mirror-ci-bv.mgr.suse.de" use_mirror_images = true @@ -551,30 +551,6 @@ module "debian12_minion" { install_salt_bundle = true } -module "opensuse154arm_minion" { - providers = { - libvirt = libvirt.suma-arm - } - source = "./modules/minion" - base_configuration = module.base_arm.configuration - product_version = "uyuni-master" - name = "nue-min-opensuse154arm" - image = "opensuse154armo" - provider_settings = { - mac = "aa:b2:93:02:01:bf" - overwrite_fqdn = "uyuni-bv-master-min-opensuse154arm.mgr.suse.de" - memory = 2048 - vcpu = 2 - xslt = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt") - } - 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" -} - module "opensuse155arm_minion" { providers = { libvirt = libvirt.suma-arm @@ -1045,26 +1021,6 @@ module "debian12_ssh_minion" { install_salt_bundle = true } -module "opensuse154arm_ssh_minion" { - providers = { - libvirt = libvirt.suma-arm - } - source = "./modules/sshminion" - base_configuration = module.base_arm.configuration - product_version = "uyuni-master" - name = "nue-minssh-opensuse154arm" - image = "opensuse154armo" - provider_settings = { - mac = "aa:b2:93:02:01:df" - overwrite_fqdn = "uyuni-bv-master-minssh-opensuse154arm.mgr.suse.de" - 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" -} - module "opensuse155arm_ssh_minion" { providers = { libvirt = libvirt.suma-arm @@ -1370,9 +1326,6 @@ module "controller" { debian12_minion_configuration = module.debian12_minion.configuration debian12_sshminion_configuration = module.debian12_ssh_minion.configuration - opensuse154arm_minion_configuration = module.opensuse154arm_minion.configuration - opensuse154arm_sshminion_configuration = module.opensuse154arm_ssh_minion.configuration - opensuse155arm_minion_configuration = module.opensuse155arm_minion.configuration opensuse155arm_sshminion_configuration = module.opensuse155arm_ssh_minion.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 index 4d9fad65c..2838a589f 100644 --- a/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf +++ b/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf @@ -287,7 +287,7 @@ module "base_arm" { name_prefix = "uyuni-bv-master-" use_avahi = false domain = "mgr.prv.suse.net" - images = [ "opensuse154armo", "opensuse155armo", "opensuse156armo" ] + images = [ "opensuse155armo", "opensuse156armo" ] mirror = "minima-mirror-ci-bv.mgr.prv.suse.net" use_mirror_images = true @@ -747,30 +747,6 @@ module "debian12_minion" { install_salt_bundle = true } -module "opensuse154arm_minion" { - providers = { - libvirt = libvirt.suma-arm - } - source = "./modules/minion" - base_configuration = module.base_arm.configuration - product_version = "uyuni-master" - name = "prv-min-opensuse154arm" - image = "opensuse154armo" - provider_settings = { - mac = "aa:b2:92:42:00:0c" - overwrite_fqdn = "uyuni-bv-master-min-opensuse154arm.mgr.prv.suse.net" - memory = 2048 - vcpu = 2 - xslt = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt") - } - 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 "opensuse155arm_minion" { providers = { libvirt = libvirt.suma-arm @@ -1308,26 +1284,6 @@ module "debian12_ssh_minion" { install_salt_bundle = true } -module "opensuse154arm_ssh_minion" { - providers = { - libvirt = libvirt.suma-arm - } - source = "./modules/sshminion" - base_configuration = module.base_arm.configuration - product_version = "uyuni-master" - name = "prv-minssh-opensuse154arm" - image = "opensuse154armo" - provider_settings = { - mac = "aa:b2:92:42:00:0d" - overwrite_fqdn = "uyuni-bv-master-minssh-opensuse154arm.mgr.prv.suse.net" - 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" -} - module "opensuse155arm_ssh_minion" { providers = { libvirt = libvirt.suma-arm @@ -1665,9 +1621,6 @@ module "controller" { debian12_minion_configuration = module.debian12_minion.configuration debian12_sshminion_configuration = module.debian12_ssh_minion.configuration - opensuse154arm_minion_configuration = module.opensuse154arm_minion.configuration - opensuse154arm_sshminion_configuration = module.opensuse154arm_ssh_minion.configuration - opensuse155arm_minion_configuration = module.opensuse155arm_minion.configuration opensuse155arm_sshminion_configuration = module.opensuse155arm_ssh_minion.configuration