@@ -7,7 +7,7 @@ variable "URL_PREFIX" {
7
7
// Not really used as this is for --runall parameter, and we run cucumber step by step
8
8
variable "CUCUMBER_COMMAND" {
9
9
type = string
10
- default = " export PRODUCT='Uyuni ' && run-testsuite"
10
+ default = " export PRODUCT='SUSE-Manager ' && run-testsuite"
11
11
}
12
12
13
13
variable "CUCUMBER_GITREPO" {
@@ -85,13 +85,14 @@ terraform {
85
85
}
86
86
87
87
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"
89
90
}
90
91
91
92
module "cucumber_testsuite" {
92
93
source = " ./modules/cucumber_testsuite"
93
94
94
- product_version = " uyuni-master "
95
+ product_version = " 4.3-nightly "
95
96
96
97
// Cucumber repository configuration for the controller
97
98
git_username = var. GIT_USER
@@ -102,7 +103,7 @@ module "cucumber_testsuite" {
102
103
cc_username = var. SCC_USER
103
104
cc_password = var. SCC_PASSWORD
104
105
105
- images = [" centos7o" , " opensuse154o" , " sles15sp4o" , " ubuntu2204o" ]
106
+ images = [" centos7o" , " rocky8o " , " opensuse154o" , " sles15sp4o" , " ubuntu2204o" ]
106
107
107
108
use_avahi = false
108
109
name_prefix = " suma-testnaica-"
@@ -122,35 +123,36 @@ module "cucumber_testsuite" {
122
123
controller = {
123
124
provider_settings = {
124
125
mac = " aa:b2:93:01:00:60"
126
+ vcpu = 2
127
+ memory = 2048
125
128
}
126
129
}
127
130
server = {
128
131
provider_settings = {
129
132
mac = " aa:b2:93:01:00:61"
133
+ memory = 16384
130
134
}
131
- /* TODO: needs to be upgraded to openSUSE_Leap_15.4?
132
135
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 /"
134
137
}
135
- */
136
138
}
137
- /*
138
139
proxy = {
139
140
provider_settings = {
140
141
mac = " aa:b2:93:01:00:62"
141
142
}
142
143
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 /"
144
145
}
145
146
additional_packages = [ " venv-salt-minion" ]
146
147
install_salt_bundle = true
147
148
}
148
- */
149
149
suse-client = {
150
150
image = " sles15sp4o"
151
151
name = " cli-sles15"
152
152
provider_settings = {
153
153
mac = " aa:b2:93:01:00:64"
154
+ vcpu = 2
155
+ memory = 2048
154
156
}
155
157
additional_packages = [ " venv-salt-minion" ]
156
158
install_salt_bundle = true
@@ -160,6 +162,8 @@ module "cucumber_testsuite" {
160
162
name = " min-sles15"
161
163
provider_settings = {
162
164
mac = " aa:b2:93:01:00:66"
165
+ vcpu = 2
166
+ memory = 2048
163
167
}
164
168
additional_packages = [ " venv-salt-minion" ]
165
169
install_salt_bundle = true
@@ -169,12 +173,15 @@ module "cucumber_testsuite" {
169
173
name = " minssh-sles15"
170
174
provider_settings = {
171
175
mac = " aa:b2:93:01:00:68"
176
+ vcpu = 2
177
+ memory = 2048
172
178
}
173
- additional_packages = [ " venv-salt-minion" ]
179
+ additional_packages = [ " venv-salt-minion" , " iptables " ]
174
180
install_salt_bundle = true
175
181
}
176
182
redhat-minion = {
177
183
image = " centos7o"
184
+ name = " min-centos7"
178
185
provider_settings = {
179
186
mac = " aa:b2:93:01:00:69"
180
187
// 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" {
190
197
image = " ubuntu2204o"
191
198
provider_settings = {
192
199
mac = " aa:b2:93:01:00:6b"
200
+ vcpu = 2
201
+ memory = 2048
193
202
}
194
203
additional_packages = [ " venv-salt-minion" ]
195
204
install_salt_bundle = true
@@ -200,16 +209,16 @@ module "cucumber_testsuite" {
200
209
provider_settings = {
201
210
mac = " aa:b2:93:01:00:6d"
202
211
memory = 2048
212
+ vcpu = 2
203
213
}
204
214
additional_packages = [ " venv-salt-minion" ]
205
215
install_salt_bundle = true
206
216
}
207
217
}
208
218
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"
213
222
}
214
223
}
215
224
0 commit comments