Skip to content

Commit 0dde990

Browse files
authored
Merge pull request #45238 from hashicorp/t-skip-TeamCity-testing-EOL
Tech debt: Don't run TeamCity acceptance tests for EOL services
2 parents 4f9280d + 3f78751 commit 0dde990

File tree

2 files changed

+29
-9
lines changed

2 files changed

+29
-9
lines changed

.teamcity/components/generated/services_all.kt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,13 @@ val services = mapOf(
9999
"elasticache" to ServiceSpec("ElastiCache", vpcLock = true),
100100
"elasticbeanstalk" to ServiceSpec("Elastic Beanstalk", vpcLock = true),
101101
"elasticsearch" to ServiceSpec("Elasticsearch", vpcLock = true),
102-
"elastictranscoder" to ServiceSpec("Elastic Transcoder"),
103102
"elb" to ServiceSpec("ELB Classic", vpcLock = true),
104103
"elbv2" to ServiceSpec("ELB (Elastic Load Balancing)", vpcLock = true),
105104
"emr" to ServiceSpec("EMR", vpcLock = true),
106105
"emrcontainers" to ServiceSpec("EMR Containers"),
107106
"emrserverless" to ServiceSpec("EMR Serverless"),
108107
"events" to ServiceSpec("EventBridge"),
109-
"evidently" to ServiceSpec("CloudWatch Evidently"),
110108
"evs" to ServiceSpec("Elastic VMware"),
111-
"finspace" to ServiceSpec("FinSpace"),
112109
"firehose" to ServiceSpec("Kinesis Firehose"),
113110
"fis" to ServiceSpec("FIS (Fault Injection Simulator)"),
114111
"fms" to ServiceSpec("FMS (Firewall Manager)", regionOverride = "us-east-1"),
@@ -142,13 +139,11 @@ val services = mapOf(
142139
"lakeformation" to ServiceSpec("Lake Formation"),
143140
"lambda" to ServiceSpec("Lambda", vpcLock = true),
144141
"launchwizard" to ServiceSpec("Launch Wizard"),
145-
"lexmodels" to ServiceSpec("Lex Model Building"),
146142
"lexv2models" to ServiceSpec("Lex V2 Models"),
147143
"licensemanager" to ServiceSpec("License Manager"),
148144
"lightsail" to ServiceSpec("Lightsail", regionOverride = "us-east-1"),
149145
"location" to ServiceSpec("Location"),
150146
"logs" to ServiceSpec("CloudWatch Logs"),
151-
"m2" to ServiceSpec("Mainframe Modernization"),
152147
"macie2" to ServiceSpec("Macie"),
153148
"mediaconnect" to ServiceSpec("Elemental MediaConnect"),
154149
"mediaconvert" to ServiceSpec("Elemental MediaConvert"),
@@ -186,7 +181,6 @@ val services = mapOf(
186181
"polly" to ServiceSpec("Polly"),
187182
"pricing" to ServiceSpec("Pricing Calculator", regionOverride = "us-east-1"),
188183
"qbusiness" to ServiceSpec("Amazon Q Business"),
189-
"qldb" to ServiceSpec("QLDB (Quantum Ledger Database)"),
190184
"quicksight" to ServiceSpec("QuickSight"),
191185
"ram" to ServiceSpec("RAM (Resource Access Manager)"),
192186
"rbin" to ServiceSpec("Recycle Bin (RBin)"),
@@ -254,8 +248,6 @@ val services = mapOf(
254248
"vpclattice" to ServiceSpec("VPC Lattice", vpcLock = true, parallelismOverride = 10),
255249
"vpnclient" to ServiceSpec("VPN (Client)", vpcLock = true, patternOverride = "TestAccClientVPN", splitPackageRealPackage = "ec2"),
256250
"vpnsite" to ServiceSpec("VPN (Site-to-Site)", vpcLock = true, patternOverride = "TestAccSiteVPN", splitPackageRealPackage = "ec2"),
257-
"waf" to ServiceSpec("WAF Classic", regionOverride = "us-east-1"),
258-
"wafregional" to ServiceSpec("WAF Classic Regional"),
259251
"wafv2" to ServiceSpec("WAF"),
260252
"wavelength" to ServiceSpec("Wavelength", vpcLock = true, patternOverride = "TestAccWavelength", splitPackageRealPackage = "ec2"),
261253
"wellarchitected" to ServiceSpec("Well-Architected Tool"),

internal/generate/teamcity/acctest_services.hcl

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,10 @@ service "elasticsearch" {
142142
vpc_lock = true
143143
}
144144

145+
service "elastictranscoder" {
146+
skip = true
147+
}
148+
145149
service "elb" {
146150
vpc_lock = true
147151
}
@@ -154,6 +158,14 @@ service "emr" {
154158
vpc_lock = true
155159
}
156160

161+
service "evidently" {
162+
skip = true
163+
}
164+
165+
service "finspace" {
166+
skip = true
167+
}
168+
157169
service "fms" {
158170
region = "us-east-1"
159171
}
@@ -192,10 +204,18 @@ service "lambda" {
192204
vpc_lock = true
193205
}
194206

207+
service "lexmodels" {
208+
skip = true
209+
}
210+
195211
service "lightsail" {
196212
region = "us-east-1"
197213
}
198214

215+
service "m2" {
216+
skip = true
217+
}
218+
199219
service "mq" {
200220
vpc_lock = true
201221
}
@@ -224,6 +244,10 @@ service "pricing" {
224244
region = "us-east-1"
225245
}
226246

247+
service "qldb" {
248+
skip = true
249+
}
250+
227251
service "rds" {
228252
vpc_lock = true
229253
}
@@ -309,7 +333,11 @@ service "vpnsite" {
309333
}
310334

311335
service "waf" {
312-
region = "us-east-1"
336+
skip = true
337+
}
338+
339+
service "wafregional" {
340+
skip = true
313341
}
314342

315343
service "wavelength" {

0 commit comments

Comments
 (0)