Skip to content

Commit 4a5af90

Browse files
szachovyszachovy
committed
Add SCC PTF variables to TF files
1 parent 1a34c01 commit 4a5af90

30 files changed

+413
-3
lines changed

‎terracumber_config/tf_files/MLM-5.1-NUE.tf‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,18 @@ variable "SCC_PASSWORD" {
6464
type = string
6565
}
6666

67+
variable "SCC_PTF_USER" {
68+
type = string
69+
default = null
70+
// Not needed for master, as PTFs are only build for SUSE Manager / MLM
71+
}
72+
73+
variable "SCC_PTF_PASSWORD" {
74+
type = string
75+
default = null
76+
// Not needed for master, as PTFs are only build for SUSE Manager / MLM
77+
}
78+
6779
variable "GIT_USER" {
6880
type = string
6981
default = null // Not needed for master, as it is public
@@ -107,6 +119,9 @@ module "cucumber_testsuite" {
107119
cc_username = var.SCC_USER
108120
cc_password = var.SCC_PASSWORD
109121

122+
cc_ptf_username = var.SCC_PTF_USER
123+
cc_ptf_password = var.SCC_PTF_PASSWORD
124+
110125
images = ["rocky8o", "opensuse155o", "opensuse156o", "ubuntu2404o", "sles15sp4o", "slmicro61o"]
111126

112127
use_avahi = false

‎terracumber_config/tf_files/MLM-5.1-PRV.tf‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,18 @@ variable "SCC_PASSWORD" {
6464
type = string
6565
}
6666

67+
variable "SCC_PTF_USER" {
68+
type = string
69+
default = null
70+
// Not needed for master, as PTFs are only build for SUSE Manager / MLM
71+
}
72+
73+
variable "SCC_PTF_PASSWORD" {
74+
type = string
75+
default = null
76+
// Not needed for master, as PTFs are only build for SUSE Manager / MLM
77+
}
78+
6779
variable "GIT_USER" {
6880
type = string
6981
default = null // Not needed for master, as it is public
@@ -107,6 +119,9 @@ module "cucumber_testsuite" {
107119
cc_username = var.SCC_USER
108120
cc_password = var.SCC_PASSWORD
109121

122+
cc_ptf_username = var.SCC_PTF_USER
123+
cc_ptf_password = var.SCC_PTF_PASSWORD
124+
110125
images = ["rocky8o", "opensuse155o", "opensuse156o", "ubuntu2404o", "sles15sp4o", "slmicro61o"]
111126

112127
use_avahi = false

‎terracumber_config/tf_files/MLM-5.1-micro-SLE-update-NUE.tf‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,16 @@ variable "SCC_PASSWORD" {
6464
type = string
6565
}
6666

67+
variable "SCC_PTF_USER" {
68+
type = string
69+
default = null
70+
}
71+
72+
variable "SCC_PTF_PASSWORD" {
73+
type = string
74+
default = null
75+
}
76+
6777
variable "SERVER_CONTAINER_REPOSITORY" {
6878
type = string
6979
}
@@ -214,6 +224,9 @@ module "controller" {
214224
}
215225
swap_file_size = null
216226

227+
cc_ptf_username = var.SCC_PTF_USER
228+
cc_ptf_password = var.SCC_PTF_PASSWORD
229+
217230
// Cucumber repository configuration for the controller
218231
git_username = var.GIT_USER
219232
git_password = var.GIT_PASSWORD

‎terracumber_config/tf_files/MLM-5.1-micro-build-validation-NUE.tf‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,18 @@ variable "SCC_PASSWORD" {
6464
type = string
6565
}
6666

67+
variable "SCC_PTF_USER" {
68+
type = string
69+
default = null
70+
// Not needed for master, as PTFs are only build for SUSE Manager / MLM
71+
}
72+
73+
variable "SCC_PTF_PASSWORD" {
74+
type = string
75+
default = null
76+
// Not needed for master, as PTFs are only build for SUSE Manager / MLM
77+
}
78+
6779
variable "SERVER_CONTAINER_REPOSITORY" {
6880
type = string
6981
}
@@ -1162,6 +1174,9 @@ module "controller" {
11621174
swap_file_size = null
11631175
beta_enabled = false
11641176

1177+
cc_ptf_username = var.SCC_PTF_USER
1178+
cc_ptf_password = var.SCC_PTF_PASSWORD
1179+
11651180
// Cucumber repository configuration for the controller
11661181
git_username = var.GIT_USER
11671182
git_password = var.GIT_PASSWORD

‎terracumber_config/tf_files/MLM-5.1-refenv-NUE.tf‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,18 @@ variable "SCC_PASSWORD" {
6868
type = string
6969
}
7070

71+
variable "SCC_PTF_USER" {
72+
type = string
73+
default = null
74+
// Not needed for master, as PTFs are only build for SUSE Manager / MLM
75+
}
76+
77+
variable "SCC_PTF_PASSWORD" {
78+
type = string
79+
default = null
80+
// Not needed for master, as PTFs are only build for SUSE Manager / MLM
81+
}
82+
7183
variable "GIT_USER" {
7284
type = string
7385
default = null // Not needed for master, as it is public
@@ -106,6 +118,9 @@ module "cucumber_testsuite" {
106118
cc_username = var.SCC_USER
107119
cc_password = var.SCC_PASSWORD
108120

121+
cc_ptf_username = var.SCC_PTF_USER
122+
cc_ptf_password = var.SCC_PTF_PASSWORD
123+
109124
images = ["rocky8o", "opensuse155o", "opensuse156o", "ubuntu2404o", "sles15sp4o", "slmicro61o"]
110125

111126
use_avahi = false

‎terracumber_config/tf_files/MLM-5.1-sles-SLE-update-NUE.tf‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,16 @@ variable "SCC_PASSWORD" {
6464
type = string
6565
}
6666

67+
variable "SCC_PTF_USER" {
68+
type = string
69+
default = null
70+
}
71+
72+
variable "SCC_PTF_PASSWORD" {
73+
type = string
74+
default = null
75+
}
76+
6777
variable "SERVER_CONTAINER_REPOSITORY" {
6878
type = string
6979
}
@@ -212,6 +222,9 @@ module "controller" {
212222
}
213223
swap_file_size = null
214224

225+
cc_ptf_username = var.SCC_PTF_USER
226+
cc_ptf_password = var.SCC_PTF_PASSWORD
227+
215228
// Cucumber repository configuration for the controller
216229
git_username = var.GIT_USER
217230
git_password = var.GIT_PASSWORD

‎terracumber_config/tf_files/MLM-5.1-sles-build-validation-NUE.tf‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,16 @@ variable "SCC_PASSWORD" {
6464
type = string
6565
}
6666

67+
variable "SCC_PTF_USER" {
68+
type = string
69+
default = null
70+
}
71+
72+
variable "SCC_PTF_PASSWORD" {
73+
type = string
74+
default = null
75+
}
76+
6777
variable "SERVER_CONTAINER_REPOSITORY" {
6878
type = string
6979
}
@@ -106,6 +116,7 @@ module "base" {
106116

107117
cc_username = var.SCC_USER
108118
cc_password = var.SCC_PASSWORD
119+
109120
product_version = "5.1-released"
110121

111122
name_prefix = "mlm-bv-51sles-"
@@ -213,6 +224,9 @@ module "controller" {
213224
}
214225
swap_file_size = null
215226

227+
cc_ptf_username = var.SCC_PTF_USER
228+
cc_ptf_password = var.SCC_PTF_PASSWORD
229+
216230
// Cucumber repository configuration for the controller
217231
git_username = var.GIT_USER
218232
git_password = var.GIT_PASSWORD

‎terracumber_config/tf_files/MLM-Head-NUE.tf‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,18 @@ variable "SCC_PASSWORD" {
6464
type = string
6565
}
6666

67+
variable "SCC_PTF_USER" {
68+
type = string
69+
default = null
70+
// Not needed for master, as PTFs are only build for SUSE Manager / MLM
71+
}
72+
73+
variable "SCC_PTF_PASSWORD" {
74+
type = string
75+
default = null
76+
// Not needed for master, as PTFs are only build for SUSE Manager / MLM
77+
}
78+
6779
variable "GIT_USER" {
6880
type = string
6981
default = null // Not needed for master, as it is public
@@ -101,6 +113,8 @@ module "cucumber_testsuite" {
101113

102114
cc_username = var.SCC_USER
103115
cc_password = var.SCC_PASSWORD
116+
cc_ptf_username = var.SCC_PTF_USER
117+
cc_ptf_password = var.SCC_PTF_PASSWORD
104118

105119
images = ["rocky8o", "opensuse155o", "opensuse156o", "ubuntu2404o", "sles15sp4o", "slmicro61o"]
106120

‎terracumber_config/tf_files/MLM-Head-refenv-NUE.tf‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,18 @@ variable "SCC_PASSWORD" {
6868
type = string
6969
}
7070

71+
variable "SCC_PTF_USER" {
72+
type = string
73+
default = null
74+
// Not needed for master, as PTFs are only build for SUSE Manager / MLM
75+
}
76+
77+
variable "SCC_PTF_PASSWORD" {
78+
type = string
79+
default = null
80+
// Not needed for master, as PTFs are only build for SUSE Manager / MLM
81+
}
82+
7183
variable "GIT_USER" {
7284
type = string
7385
default = null // Not needed for master, as it is public
@@ -105,6 +117,8 @@ module "cucumber_testsuite" {
105117

106118
cc_username = var.SCC_USER
107119
cc_password = var.SCC_PASSWORD
120+
cc_ptf_username = var.SCC_PTF_USER
121+
cc_ptf_password = var.SCC_PTF_PASSWORD
108122

109123
images = ["rocky8o", "opensuse155o", "opensuse156o", "ubuntu2404o", "sles15sp4o", "slmicro61o"]
110124

‎terracumber_config/tf_files/PR-testing-template.tf‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ module "cucumber_testsuite" {
2323
git_repo = var.CUCUMBER_GITREPO
2424
branch = var.CUCUMBER_BRANCH
2525

26-
cc_username = var.SCC_USER
27-
cc_password = var.SCC_PASSWORD
28-
mirror = var.MIRROR
26+
cc_username = var.SCC_USER
27+
cc_password = var.SCC_PASSWORD
28+
cc_ptf_username = var.SCC_PTF_USER
29+
cc_ptf_password = var.SCC_PTF_PASSWORD
30+
mirror = var.MIRROR
2931
use_mirror_images = var.USE_MIRROR_IMAGES
3032

3133
images = var.IMAGES

0 commit comments

Comments
 (0)