Skip to content

Commit e6a729c

Browse files
committed
smoke: unblock TestCuttingEdgeCluster on released provision-aws v0.1.7
- shorten Name "cutting-edge" -> "cuttingedge" (11 chars): the 12-char value overflowed the 32-char AWS LB/target-group name limit and was the actual CI failure ("name" cannot be longer than 32 characters) - pin examples/terraform/aws-simple to provision-aws >= 0.1.7, which ships the rhel_10/rocky_10 platform keys (provision-aws#22, released) - refresh test doc comment now the upstream dependency is merged/released gofmt also normalized two pre-existing violations in smoke_test.go.
1 parent 4a39ab5 commit e6a729c

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

examples/terraform/aws-simple/platform.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ locals {
4444
module "platform" {
4545
count = length(local.upstream_platform_keys)
4646
source = "terraform-mirantis-modules/provision-aws/mirantis//modules/platform"
47+
version = ">= 0.1.7"
4748

4849
platform_key = local.upstream_platform_keys[count.index]
4950
windows_password = var.windows_password

examples/terraform/aws-simple/provision.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ locals {
77
# PROVISION MACHINES/NETWORK
88
module "provision" {
99
source = "terraform-mirantis-modules/provision-aws/mirantis"
10+
version = ">= 0.1.7"
1011

1112
name = var.name
1213
common_tags = local.tags

test/smoke/smoke_test.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func runSmokeTest(t *testing.T, cfg smokeConfig) {
112112
"nodegroups": cfg.Nodegroups,
113113
"ssh_key_algorithm": cfg.SSHKeyAlgorithm,
114114
"extra_tags": map[string]string{
115-
"launchpad-smoke-test": "true",
115+
"launchpad-smoke-test": "true",
116116
"launchpad-smoke-test-name": cfg.Name,
117117
},
118118
}
@@ -193,11 +193,15 @@ func TestModernCluster(t *testing.T) {
193193

194194
// TestCuttingEdgeCluster exercises rhel10/rocky10/ubuntu24 managers and workers
195195
// with sles15 as an additional worker, using the latest MCR and MKE versions.
196-
// Requires terraform-mirantis-modules/terraform-mirantis-provision-aws PR #22 (rhel_10/rocky_10
197-
// platform keys) to be merged and the module version bumped before this test can run.
196+
// The rhel_10/rocky_10 platform keys are available in
197+
// terraform-mirantis-provision-aws >= v0.1.7 (pinned in examples/terraform/aws-simple).
198198
func TestCuttingEdgeCluster(t *testing.T) {
199199
runSmokeTest(t, smokeConfig{
200-
Name: "cutting-edge",
200+
// AWS LB/target-group names are capped at 32 chars: the stack name is
201+
// "smoke-{Name}-{5-char-random}" and Terraform appends suffixes like
202+
// "-mke-kube" (9 chars), capping len(Name) at 11. Hence "cuttingedge"
203+
// rather than "cutting-edge" (12 chars).
204+
Name: "cuttingedge",
201205
MCRChannel: "stable-29.4",
202206
MKEVersion: "3.9.2",
203207
MSRVersion: "3.1.18",

0 commit comments

Comments
 (0)