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

Move product_version to base level. #1404

Merged
merged 3 commits into from
Oct 3, 2024
Merged

Move product_version to base level. #1404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbff9ef
Move product_version to base level.
maximenoel8 Oct 2, 2024
d9a5b65
Fix 4.3 NUE main.tf
maximenoel8 Oct 2, 2024
fc9381d
Impact sle update pipelines.
maximenoel8 Oct 2, 2024
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
23 changes: 10 additions & 13 deletions terracumber_config/tf_files/SUSEManager-4.3-SLE-update.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,19 +89,20 @@ provider "libvirt" {
}

module "base" {
source = "./modules/base"
source = "./modules/base"

cc_username = var.SCC_USER
cc_password = var.SCC_PASSWORD
name_prefix = "suma-su-43-"
use_avahi = false
domain = "mgr.prv.suse.net"
images = [ "sles15sp4o", "opensuse155o" ]
cc_username = var.SCC_USER
cc_password = var.SCC_PASSWORD
product_version = "4.3-released"
name_prefix = "suma-su-43-"
use_avahi = false
domain = "mgr.prv.suse.net"
images = [ "sles15sp4o", "opensuse155o" ]

mirror = "minima-mirror-ci-bv.mgr.prv.suse.net"
mirror = "minima-mirror-ci-bv.mgr.prv.suse.net"
use_mirror_images = true

testsuite = true
testsuite = true

provider_settings = {
pool = "ssd"
Expand All @@ -112,7 +113,6 @@ module "base" {
module "server" {
source = "./modules/server"
base_configuration = module.base.configuration
product_version = "4.3-released"
name = "server"
provider_settings = {
mac = "aa:b2:92:05:00:f9"
Expand Down Expand Up @@ -148,7 +148,6 @@ module "server" {
module "proxy" {
source = "./modules/proxy"
base_configuration = module.base.configuration
product_version = "4.3-released"
name = "proxy"
provider_settings = {
mac = "aa:b2:92:05:00:fa"
Expand Down Expand Up @@ -176,7 +175,6 @@ module "proxy" {
module "sles15sp4_minion" {
source = "./modules/minion"
base_configuration = module.base.configuration
product_version = "4.3-released"
name = "sles15sp4-minion"
image = "sles15sp4o"
provider_settings = {
Expand Down Expand Up @@ -205,7 +203,6 @@ module "controller" {
vcpu = 8
}
swap_file_size = null
product_version = "4.3-released"

// Cucumber repository configuration for the controller
git_username = var.GIT_USER
Expand Down
2 changes: 1 addition & 1 deletion terracumber_config/tf_files/SUSEManager-4.3-build-validation-AWS.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ module "base" {
use_avahi = false
use_eip_bastion = false
is_server_paygo_instance = false
product_version = "4.3-released"
provider_settings = {
availability_zone = var.AVAILABILITY_ZONE
region = var.REGION
Expand Down Expand Up @@ -172,7 +173,6 @@ module "server" {
mirror = null
})
name = "server"
product_version = "4.3-released"
main_disk_size = 200
repository_disk_size = 1500
database_disk_size = 0
Expand Down
Loading
Loading