Skip to content

Commit 1356ed9

Browse files
committed
Update Test Naica setup
1 parent 1796b5f commit 1356ed9

File tree

1 file changed

+24
-15
lines changed

1 file changed

+24
-15
lines changed

terracumber_config/tf_files/SUSEManager-Test-Naica-NUE.tf

+24-15
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ variable "URL_PREFIX" {
77
// Not really used as this is for --runall parameter, and we run cucumber step by step
88
variable "CUCUMBER_COMMAND" {
99
type = string
10-
default = "export PRODUCT='Uyuni' && run-testsuite"
10+
default = "export PRODUCT='SUSE-Manager' && run-testsuite"
1111
}
1212

1313
variable "CUCUMBER_GITREPO" {
@@ -85,13 +85,14 @@ terraform {
8585
}
8686

8787
provider "libvirt" {
88-
uri = "qemu+tcp://cthulhu.mgr.suse.de/system"
88+
//uri = "qemu+tcp://cthulhu.mgr.suse.de/system"
89+
uri = "qemu+tcp://suma-04.mgr.suse.de/system"
8990
}
9091

9192
module "cucumber_testsuite" {
9293
source = "./modules/cucumber_testsuite"
9394

94-
product_version = "uyuni-master"
95+
product_version = "4.3-nightly"
9596

9697
// Cucumber repository configuration for the controller
9798
git_username = var.GIT_USER
@@ -102,7 +103,7 @@ module "cucumber_testsuite" {
102103
cc_username = var.SCC_USER
103104
cc_password = var.SCC_PASSWORD
104105

105-
images = ["centos7o", "opensuse154o", "sles15sp4o", "ubuntu2204o"]
106+
images = ["centos7o", "rocky8o", "opensuse154o", "sles15sp4o", "ubuntu2204o"]
106107

107108
use_avahi = false
108109
name_prefix = "suma-testnaica-"
@@ -122,35 +123,36 @@ module "cucumber_testsuite" {
122123
controller = {
123124
provider_settings = {
124125
mac = "aa:b2:93:01:00:60"
126+
vcpu = 2
127+
memory = 2048
125128
}
126129
}
127130
server = {
128131
provider_settings = {
129132
mac = "aa:b2:93:01:00:61"
133+
memory = 16384
130134
}
131-
/* TODO: needs to be upgraded to openSUSE_Leap_15.4?
132135
additional_repos = {
133-
Test_repo = "http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/TEST:/Naica/openSUSE_Leap_15.3/"
136+
Test_repo = "http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/TEST:/Orion/4_3-SLE_15_SP4/"
134137
}
135-
*/
136138
}
137-
/*
138139
proxy = {
139140
provider_settings = {
140141
mac = "aa:b2:93:01:00:62"
141142
}
142143
additional_repos = {
143-
Test_repo = "http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/TEST:/Naica/openSUSE_Leap_15.3/"
144+
Test_repo = "http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/TEST:/Orion/4_3-SLE_15_SP4/"
144145
}
145146
additional_packages = [ "venv-salt-minion" ]
146147
install_salt_bundle = true
147148
}
148-
*/
149149
suse-client = {
150150
image = "sles15sp4o"
151151
name = "cli-sles15"
152152
provider_settings = {
153153
mac = "aa:b2:93:01:00:64"
154+
vcpu = 2
155+
memory = 2048
154156
}
155157
additional_packages = [ "venv-salt-minion" ]
156158
install_salt_bundle = true
@@ -160,6 +162,8 @@ module "cucumber_testsuite" {
160162
name = "min-sles15"
161163
provider_settings = {
162164
mac = "aa:b2:93:01:00:66"
165+
vcpu = 2
166+
memory = 2048
163167
}
164168
additional_packages = [ "venv-salt-minion" ]
165169
install_salt_bundle = true
@@ -169,12 +173,15 @@ module "cucumber_testsuite" {
169173
name = "minssh-sles15"
170174
provider_settings = {
171175
mac = "aa:b2:93:01:00:68"
176+
vcpu = 2
177+
memory = 2048
172178
}
173-
additional_packages = [ "venv-salt-minion" ]
179+
additional_packages = [ "venv-salt-minion", "iptables" ]
174180
install_salt_bundle = true
175181
}
176182
redhat-minion = {
177183
image = "centos7o"
184+
name = "min-centos7"
178185
provider_settings = {
179186
mac = "aa:b2:93:01:00:69"
180187
// 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
@@ -190,6 +197,8 @@ module "cucumber_testsuite" {
190197
image = "ubuntu2204o"
191198
provider_settings = {
192199
mac = "aa:b2:93:01:00:6b"
200+
vcpu = 2
201+
memory = 2048
193202
}
194203
additional_packages = [ "venv-salt-minion" ]
195204
install_salt_bundle = true
@@ -200,16 +209,16 @@ module "cucumber_testsuite" {
200209
provider_settings = {
201210
mac = "aa:b2:93:01:00:6d"
202211
memory = 2048
212+
vcpu = 2
203213
}
204214
additional_packages = [ "venv-salt-minion" ]
205215
install_salt_bundle = true
206216
}
207217
}
208218
provider_settings = {
209-
pool = "ssd"
210-
network_name = null
211-
bridge = "br0"
212-
additional_network = "192.168.142.0/24"
219+
pool = "ssd"
220+
network_name = null
221+
bridge = "br0"
213222
}
214223
}
215224

0 commit comments

Comments
 (0)