Skip to content

Commit 5f67bd1

Browse files
Add GOOGLE_VMWAREENGINE_PROJECT env var for vmwareengine tests (#12707) (#20855)
[upstream:415b35bae8e1e92e6949d472b987105f369be650] Signed-off-by: Modular Magician <magic-modules@google.com>
1 parent 3202217 commit 5f67bd1

File tree

5 files changed

+34
-0
lines changed

5 files changed

+34
-0
lines changed

.changelog/12707.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

.teamcity/components/builds/build_parameters.kt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ class AllContextParameters(
6161
val chronicleInstanceIdBeta: String,
6262
val chronicleInstanceIdVcr: String,
6363

64+
// GOOGLE_VMWAREENGINE_PROJECT
65+
val vmwareengineProjectGa: String,
66+
val vmwareengineProjectBeta: String,
67+
val vmwareengineProjectVcr: String,
68+
6469
// Values that are the same across GA, Beta, and VCR testing environments
6570
val billingAccount: String, // GOOGLE_BILLING_ACCOUNT
6671
val billingAccount2: String, // GOOGLE_BILLING_ACCOUNT_2
@@ -94,6 +99,7 @@ class AccTestConfiguration(
9499
val projectNumber: String,
95100
val region: String,
96101
val serviceAccount: String,
102+
val vmwareengineProject: String,
97103
val zone: String,
98104

99105
// VCR specific
@@ -120,6 +126,7 @@ fun getGaAcceptanceTestConfig(allConfig: AllContextParameters): AccTestConfigura
120126
allConfig.projectNumberGa,
121127
allConfig.region,
122128
allConfig.serviceAccountGa,
129+
allConfig.vmwareengineProjectGa,
123130
allConfig.zone,
124131
allConfig.infraProject,
125132
allConfig.vcrBucketName,
@@ -143,6 +150,7 @@ fun getBetaAcceptanceTestConfig(allConfig: AllContextParameters): AccTestConfigu
143150
allConfig.projectNumberBeta,
144151
allConfig.region,
145152
allConfig.serviceAccountBeta,
153+
allConfig.vmwareengineProjectBeta,
146154
allConfig.zone,
147155
allConfig.infraProject,
148156
allConfig.vcrBucketName,
@@ -166,6 +174,7 @@ fun getVcrAcceptanceTestConfig(allConfig: AllContextParameters): AccTestConfigur
166174
allConfig.projectNumberVcr,
167175
allConfig.region,
168176
allConfig.serviceAccountVcr,
177+
allConfig.vmwareengineProjectVcr,
169178
allConfig.zone,
170179
allConfig.infraProject,
171180
allConfig.vcrBucketName,
@@ -190,6 +199,7 @@ fun ParametrizedWithType.configureGoogleSpecificTestParameters(config: AccTestCo
190199
hiddenVariable("env.GOOGLE_ZONE", config.zone, "The google zone to use")
191200
hiddenVariable("env.GOOGLE_IDENTITY_USER", config.identityUser, "The user for the identity platform")
192201
hiddenVariable("env.GOOGLE_CHRONICLE_INSTANCE_ID", config.chronicleInstanceId, "The id of the Chronicle instance")
202+
hiddenVariable("env.GOOGLE_VMWAREENGINE_PROJECT", config.vmwareengineProject, "The project used for vmwareengine tests")
193203
hiddenPasswordVariable("env.GOOGLE_CREDENTIALS", config.credentials, "The Google credentials for this test runner")
194204
}
195205

.teamcity/settings.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ val org2Vcr = DslContext.getParameter("org2Vcr", "")
4949
val chronicleInstanceIdGa = DslContext.getParameter("chronicleInstanceIdGa", "")
5050
val chronicleInstanceIdBeta = DslContext.getParameter("chronicleInstanceIdBeta", "")
5151
val chronicleInstanceIdVcr = DslContext.getParameter("chronicleInstanceIdVcr", "")
52+
// GOOGLE_VMWAREENGINE_PROJECT
53+
val vmwareengineProjectGa = DslContext.getParameter("vmwareengineProjectGa", "")
54+
val vmwareengineProjectBeta = DslContext.getParameter("vmwareengineProjectBeta", "")
55+
val vmwareengineProjectVcr = DslContext.getParameter("vmwareengineProjectVcr", "")
5256

5357
// Values that are the same across GA, Beta, and VCR testing environments
5458
val billingAccount = DslContext.getParameter("billingAccount", "") // GOOGLE_BILLING_ACCOUNT
@@ -91,6 +95,9 @@ var allContextParams = AllContextParameters(
9195
chronicleInstanceIdGa,
9296
chronicleInstanceIdBeta,
9397
chronicleInstanceIdVcr,
98+
vmwareengineProjectGa,
99+
vmwareengineProjectBeta,
100+
vmwareengineProjectVcr,
94101
billingAccount,
95102
billingAccount2,
96103
custId,

.teamcity/tests/test_utils.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ fun testContextParameters(): AllContextParameters {
4444
"chronicleInstanceIdGa",
4545
"chronicleInstanceIdBeta",
4646
"chronicleInstanceIdVcr",
47+
"vmwareengineProjectGa",
48+
"vmwareengineProjectBeta",
49+
"vmwareengineProjectVcr",
4750
"billingAccount",
4851
"billingAccount2",
4952
"custId",

google/envvar/envvar_utils.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,12 @@ var ImpersonateServiceAccountEnvVars = []string{
117117
"GOOGLE_IMPERSONATE_SERVICE_ACCOUNT",
118118
}
119119

120+
// This value is the project used for vmwareengine tests. A separate project is needed
121+
// due to the limited quota allocated to each testing project
122+
var vmwareengineProjectEnvVars = []string{
123+
"GOOGLE_VMWAREENGINE_PROJECT",
124+
}
125+
120126
// AccTestPreCheck ensures at least one of the project env variables is set.
121127
func GetTestProjectNumberFromEnv() string {
122128
return transport_tpg.MultiEnvSearch(ProjectNumberEnvVars)
@@ -217,6 +223,11 @@ func GetTestChronicleInstanceIdFromEnv(t *testing.T) string {
217223
return transport_tpg.MultiEnvSearch(ChronicleInstanceIdEnvVars)
218224
}
219225

226+
func GetTestVmwareengineProjectFromEnv(t *testing.T) string {
227+
SkipIfEnvNotSet(t, vmwareengineProjectEnvVars...)
228+
return transport_tpg.MultiEnvSearch(vmwareengineProjectEnvVars)
229+
}
230+
220231
func SkipIfEnvNotSet(t *testing.T, envs ...string) {
221232
if t == nil {
222233
log.Printf("[DEBUG] Not running inside of test - skip skipping")

0 commit comments

Comments
 (0)