From d5cfcf086ced058fbf005cd5de74e55e22626a81 Mon Sep 17 00:00:00 2001 From: Eric Bischoff Date: Mon, 16 Oct 2023 16:51:36 +0200 Subject: [PATCH] Try to work around dependency issue --- .../SUSEManager-4.3-build-validation-NUE.tf | 16 ++ .../SUSEManager-4.3-build-validation-PRV.tf | 184 +++++++++--------- 2 files changed, 109 insertions(+), 91 deletions(-) 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 7d543eb8b..985d30ccf 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 @@ -624,6 +624,10 @@ module "ubuntu2004-minion" { auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" + + # WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637 + additional_packages = [ "venv-salt-minion" ] + install_salt_bundle = true } module "ubuntu2204-minion" { @@ -663,6 +667,10 @@ module "debian10-minion" { auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" + + # WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637 + additional_packages = [ "venv-salt-minion" ] + install_salt_bundle = true } module "debian11-minion" { @@ -1047,6 +1055,10 @@ module "ubuntu2004-sshminion" { } use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" + + # WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637 + additional_packages = [ "venv-salt-minion" ] + install_salt_bundle = true } module "ubuntu2204-sshminion" { @@ -1077,6 +1089,10 @@ module "debian10-sshminion" { } use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" + + # WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637 + additional_packages = [ "venv-salt-minion" ] + install_salt_bundle = true } module "debian11-sshminion" { 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 a9fa80207..20fbb4e94 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 @@ -819,29 +819,30 @@ module "rocky9-minion" { install_salt_bundle = true } -// TODO: reenable as soon as possible -// - Uyuni stable tools lacks a dependency, see https://github.com/uyuni-project/uyuni/issues/7637 -// - we should not be using Uyuni stable tools in cloud-init when testing SUSE Manager -// module "ubuntu2004-minion" { -// providers = { -// libvirt = libvirt.mandalore -// } -// source = "./modules/minion" -// base_configuration = module.base_debian.configuration -// product_version = "4.3-released" -// name = "min-ubuntu2004" -// image = "ubuntu2004o" -// provider_settings = { -// mac = "aa:b2:92:42:00:ba" -// 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 "ubuntu2004-minion" { + providers = { + libvirt = libvirt.mandalore + } + source = "./modules/minion" + base_configuration = module.base_debian.configuration + product_version = "4.3-released" + name = "min-ubuntu2004" + image = "ubuntu2004o" + provider_settings = { + mac = "aa:b2:92:42:00:ba" + 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" + + # WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637 + additional_packages = [ "venv-salt-minion" ] + install_salt_bundle = true +} module "ubuntu2204-minion" { providers = { @@ -866,30 +867,31 @@ module "ubuntu2204-minion" { // Debian 9 is not supported by 4.3 -// TODO: reenable as soon as possible -// - Uyuni stable tools lacks a dependency, see https://github.com/uyuni-project/uyuni/issues/7637 -// - we should not be using Uyuni stable tools in cloud-init when testing SUSE Manager -// module "debian10-minion" { -// providers = { -// libvirt = libvirt.mandalore -// } -// source = "./modules/minion" -// base_configuration = module.base_debian.configuration -// product_version = "4.3-released" -// name = "min-debian10" -// image = "debian10o" -// provider_settings = { -// mac = "aa:b2:92:42:00:bd" -// 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 "debian10-minion" { + providers = { + libvirt = libvirt.mandalore + } + source = "./modules/minion" + base_configuration = module.base_debian.configuration + product_version = "4.3-released" + name = "min-debian10" + image = "debian10o" + provider_settings = { + mac = "aa:b2:92:42:00:bd" + 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" + + # WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637 + additional_packages = [ "venv-salt-minion" ] + install_salt_bundle = true +} module "debian11-minion" { providers = { @@ -1316,25 +1318,26 @@ module "rocky9-sshminion" { install_salt_bundle = true } -// TODO: reenable as soon as possible -// - Uyuni stable tools lacks a dependency, see https://github.com/uyuni-project/uyuni/issues/7637 -// - we should not be using Uyuni stable tools in cloud-init when testing SUSE Manager -// module "ubuntu2004-sshminion" { -// providers = { -// libvirt = libvirt.mandalore -// } -// source = "./modules/sshminion" -// base_configuration = module.base_debian.configuration -// product_version = "4.3-released" -// name = "minssh-ubuntu2004" -// image = "ubuntu2004o" -// provider_settings = { -// mac = "aa:b2:92:42:00:da" -// memory = 4096 -// } -// use_os_released_updates = false -// ssh_key_path = "./salt/controller/id_rsa.pub" -// } +module "ubuntu2004-sshminion" { + providers = { + libvirt = libvirt.mandalore + } + source = "./modules/sshminion" + base_configuration = module.base_debian.configuration + product_version = "4.3-released" + name = "minssh-ubuntu2004" + image = "ubuntu2004o" + provider_settings = { + mac = "aa:b2:92:42:00:da" + memory = 4096 + } + use_os_released_updates = false + ssh_key_path = "./salt/controller/id_rsa.pub" + + # WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637 + additional_packages = [ "venv-salt-minion" ] + install_salt_bundle = true +} module "ubuntu2204-sshminion" { providers = { @@ -1355,25 +1358,26 @@ module "ubuntu2204-sshminion" { // Debian 9 is not supported by 4.3 -// TODO: reenable as soon as possible -// - Uyuni stable tools lacks a dependency, see https://github.com/uyuni-project/uyuni/issues/7637 -// - we should not be using Uyuni stable tools in cloud-init when testing SUSE Manager -// module "debian10-sshminion" { -// providers = { -// libvirt = libvirt.mandalore -// } -// source = "./modules/sshminion" -// base_configuration = module.base_debian.configuration -// product_version = "4.3-released" -// name = "minssh-debian10" -// image = "debian10o" -// provider_settings = { -// mac = "aa:b2:92:42:00:dd" -// memory = 4096 -// } -// use_os_released_updates = false -// ssh_key_path = "./salt/controller/id_rsa.pub" -// } +module "debian10-sshminion" { + providers = { + libvirt = libvirt.mandalore + } + source = "./modules/sshminion" + base_configuration = module.base_debian.configuration + product_version = "4.3-released" + name = "minssh-debian10" + image = "debian10o" + provider_settings = { + mac = "aa:b2:92:42:00:dd" + memory = 4096 + } + use_os_released_updates = false + ssh_key_path = "./salt/controller/id_rsa.pub" + + # WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637 + additional_packages = [ "venv-salt-minion" ] + install_salt_bundle = true +} module "debian11-sshminion" { providers = { @@ -1683,16 +1687,14 @@ module "controller" { rocky9_minion_configuration = module.rocky9-minion.configuration rocky9_sshminion_configuration = module.rocky9-sshminion.configuration -// TODO: reenable as soon as possible -// ubuntu2004_minion_configuration = module.ubuntu2004-minion.configuration -// ubuntu2004_sshminion_configuration = module.ubuntu2004-sshminion.configuration + ubuntu2004_minion_configuration = module.ubuntu2004-minion.configuration + ubuntu2004_sshminion_configuration = module.ubuntu2004-sshminion.configuration ubuntu2204_minion_configuration = module.ubuntu2204-minion.configuration ubuntu2204_sshminion_configuration = module.ubuntu2204-sshminion.configuration -// TODO: reenable as soon as possible -// debian10_minion_configuration = module.debian10-minion.configuration -// debian10_sshminion_configuration = module.debian10-sshminion.configuration + debian10_minion_configuration = module.debian10-minion.configuration + debian10_sshminion_configuration = module.debian10-sshminion.configuration debian11_minion_configuration = module.debian11-minion.configuration debian11_sshminion_configuration = module.debian11-sshminion.configuration