Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Try to work around dependency issue #998

Merged
merged 1 commit into from
Oct 16, 2023
Merged

Try to work around dependency issue #998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down Expand Up @@ -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" {
Expand Down Expand Up @@ -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" {
Expand Down Expand Up @@ -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" {
Expand Down
184 changes: 93 additions & 91 deletions terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -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 = {
Expand Down Expand Up @@ -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 = {
Expand All @@ -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 = {
Expand Down Expand Up @@ -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
Expand Down
Loading