Skip to content

Commit

Permalink
Update all squad pipeline module names and hostnames
Browse files Browse the repository at this point in the history
  • Loading branch information
maximenoel8 committed Nov 29, 2024
1 parent bac114b commit 2763b61
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 129 deletions.
36 changes: 8 additions & 28 deletions terracumber_config/tf_files/SUSEManager-Test-Hexagon-NUE.tf
Original file line number Diff line number Diff line change
Expand Up @@ -147,80 +147,60 @@ module "cucumber_testsuite" {
container_tag = "latest"
}

suse-minion = {
suse_minion = {
image = "sles15sp4o"
name = "min-suse"
provider_settings = {
mac = "aa:b2:93:01:00:56"
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
suse-sshminion = {
suse_sshminion = {
image = "sles15sp4o"
name = "minssh-suse"
provider_settings = {
mac = "aa:b2:93:01:00:58"
vcpu = 2
memory = 2048
}
additional_packages = [ "venv-salt-minion", "iptables" ]
install_salt_bundle = true
additional_packages = [ "iptables" ]
}
redhat-minion = {
rhlike-minion = {
image = "rocky8o"
name = "min-rocky8"
provider_settings = {
mac = "aa:b2:93:01:00:5a"
// Since start of May we have problems with the instance not booting after a restart if there is only a CPU and only 1024Mb for RAM
// Still researching, but it will do it for now
memory = 2048
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
debian-minion = {
deblike_minion = {
image = "ubuntu2204o"
name = "min-ubuntu2204"
provider_settings = {
mac = "aa:b2:93:01:00:5b"
vcpu = 2
memory = 2048
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
build-host = {
build_host = {
image = "sles15sp4o"
provider_settings = {
mac = "aa:b2:93:01:00:5d"
vcpu = 4
memory = 8192
}
name = "min-build"
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
pxeboot-minion = {
pxeboot_minion = {
image = "sles15sp4o"
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
provider_settings = {
vcpu = 2
memory = 2048
}
}
kvm-host = {
kvm_host = {
image = "sles15sp4o"
name = "min-kvm"

provider_settings = {
mac = "aa:b2:93:01:00:5e"
vcpu = 4
memory = 8192
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
}

Expand Down
39 changes: 9 additions & 30 deletions terracumber_config/tf_files/SUSEManager-Test-Ion-NUE.tf
Original file line number Diff line number Diff line change
Expand Up @@ -137,83 +137,62 @@ module "cucumber_testsuite" {
provider_settings = {
mac = "aa:b2:93:01:00:42"
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
slemicro-minion = {
slemicro_minion = {
provider_settings = {
mac = "aa:b2:93:01:00:44"
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = false
}
suse-minion = {
suse_minion = {
image = "sles15sp4o"
name = "min-sles15"
provider_settings = {
mac = "aa:b2:93:01:00:46"
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
suse-sshminion = {
suse_sshminion = {
image = "sles15sp4o"
name = "minssh-sles15"
provider_settings = {
mac = "aa:b2:93:01:00:48"
}
additional_packages = [ "venv-salt-minion", "iptables" ]
install_salt_bundle = true
}
redhat-minion = {
rhlike_minion = {
image = "rocky8o"
name = "min-rocky8"
provider_settings = {
mac = "aa:b2:93:01:00:49"
// Since start of May we have problems with the instance not booting after a restart if there is only a CPU and only 1024Mb for RAM
// Also, openscap cannot run with less than 1.25 GB of RAM
memory = 2048
vcpu = 2
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
ubuntu-minion = {
deblike_minion = {
image = "ubuntu2204o"
name = "min-ubuntu2204o"
provider_settings = {
// mac = "aa:b2:93:01:00:50"
// Since start of May we have problems with the instance not booting after a restart if there is only a CPU and only 1024Mb for RAM
// Also, openscap cannot run with less than 1.25 GB of RAM
memory = 2048
vcpu = 2
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
build-host = {
build_host = {
image = "sles15sp4o"
name = "min-build"
provider_settings = {
mac = "aa:b2:93:01:00:4d"
memory = 2048
vcpu = 2
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
pxeboot-minion = {
pxeboot_minion = {
image = "sles15sp4o"
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
kvm-host = {
kvm_host = {
image = "sles15sp4o"
name = "min-kvm"
provider_settings = {
mac = "aa:b2:93:01:00:4e"
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
}
provider_settings = {
Expand Down
31 changes: 6 additions & 25 deletions terracumber_config/tf_files/SUSEManager-Test-Naica-NUE.tf
Original file line number Diff line number Diff line change
Expand Up @@ -142,38 +142,27 @@ module "cucumber_testsuite" {
additional_repos = {
Test_repo = "http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/TEST:/Naica/openSUSE_Leap_15.3/"
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
*/
suse-client = {
suse_client = {
image = "sles15sp4o"
name = "cli-sles15"
provider_settings = {
mac = "aa:b2:93:01:00:64"
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
suse-minion = {
suse_minion = {
image = "sles15sp4o"
name = "min-sles15"
provider_settings = {
mac = "aa:b2:93:01:00:66"
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
suse-sshminion = {
suse_sshminion = {
image = "sles15sp4o"
name = "minssh-sles15"
provider_settings = {
mac = "aa:b2:93:01:00:68"
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
redhat-minion = {
rhlike_minion = {
image = "centos7o"
provider_settings = {
mac = "aa:b2:93:01:00:69"
Expand All @@ -182,27 +171,19 @@ module "cucumber_testsuite" {
memory = 2048
vcpu = 2
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
debian-minion = {
name = "min-ubuntu2204"
deblike_minion = {
image = "ubuntu2204o"
provider_settings = {
mac = "aa:b2:93:01:00:6b"
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
build-host = {
build_host = {
image = "sles15sp4o"
name = "min-build"
provider_settings = {
mac = "aa:b2:93:01:00:6d"
memory = 2048
}
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}
}
provider_settings = {
Expand Down
28 changes: 7 additions & 21 deletions terracumber_config/tf_files/SUSEManager-Test-Orion-NUE.tf
Original file line number Diff line number Diff line change
Expand Up @@ -153,80 +153,66 @@ module "cucumber_testsuite" {
memory = 2048
}
main_disk_size = 200
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
runtime = "podman"
container_repository = "registry.suse.de/devel/galaxy/manager/test/orion/containerfile"
container_tag = "latest"
additional_repos = {
Test_repo = "http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/TEST:/Orion/SLE_15_SP5/"
}
}
suse-minion = {
suse_minion = {
image = "sles15sp4o"
name = "min-sles15"
provider_settings = {
mac = "aa:b2:93:01:00:76"
vcpu = 2
memory = 2048
}
install_salt_bundle = true
}
suse-sshminion = {
suse_sshminion = {
image = "sles15sp4o"
name = "minssh-sles15"
provider_settings = {
mac = "aa:b2:93:01:00:78"
vcpu = 2
memory = 2048
}
additional_packages = [ "iptables" ]
install_salt_bundle = true
}
redhat-minion = {
rhlike_minion = {
image = "rocky8o"
name = "min-rocky8"
provider_settings = {
mac = "aa:b2:93:01:00:79"
// Since start of May we have problems with the instance not booting after a restart if there is only a CPU and only 1024Mb for RAM
// Also, openscap cannot run with less than 1.25 GB of RAM
vcpu = 2
memory = 2048
}
install_salt_bundle = true
}
debian-minion = {
deblike_minion = {
image = "ubuntu2204o"
name = "min-ubuntu2204"
provider_settings = {
mac = "aa:b2:93:01:00:7b"
vcpu = 2
memory = 2048
}
install_salt_bundle = true
}
build-host = {
build_host = {
image = "sles15sp4o"
name = "min-build"
provider_settings = {
mac = "aa:b2:93:01:00:7d"
vcpu = 2
memory = 2048
}
install_salt_bundle = true
}
pxeboot-minion = {
pxeboot_minion = {
image = "sles15sp4o"
}
kvm-host = {
kvm_host = {
image = "sles15sp4o"
name = "min-kvm"
provider_settings = {
mac = "aa:b2:93:01:00:7c"
vcpu = 4
memory = 4096
}
install_salt_bundle = true
}
}

Expand Down
Loading

0 comments on commit 2763b61

Please sign in to comment.