Skip to content

Commit 76a3023

Browse files
committed
OCM-00000 | ci: add fake_cluster to rosa-sts-ad profile
1 parent bf83d01 commit 76a3023

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

tests/ci/profiles/tf_classic_cluster_profiles.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ profiles:
5757
additional_sg_number: 4
5858
worker_disk_size: 200
5959
unified_acc_role_path: "/unified/"
60+
custom_properties:
61+
fake_cluster: "true"
6062
# rosa-sts-sv :: creating Shared-VPC cluster.
6163
- as: rosa-sts-sv
6264
need_specific_config: true

tests/utils/profilehandler/handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,7 @@ func (ctx *profileContext) GenerateClusterCreationArgs(token string) (clusterArg
930930
clusterArgs.WorkerDiskSize = helper.IntPointer(ctx.profile.WorkerDiskSize)
931931
}
932932
clusterArgs.UnifiedAccRolesPath = helper.StringPointer(ctx.profile.UnifiedAccRolesPath)
933-
clusterArgs.CustomProperties = helper.StringMapPointer(CustomProperties) // id:72450
933+
clusterArgs.CustomProperties = helper.StringMapPointer(helper.MergeMaps(CustomProperties, ctx.profile.CustomProperties)) // id:72450
934934

935935
if ctx.profile.FullResources {
936936
clusterArgs.FullResources = helper.BoolPointer(true)

tests/utils/profilehandler/profile.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,6 @@ type Profile struct {
5454
UseRegistryConfig bool `ini:"use_registry_config,omitempty" json:"use_registry_config,omitempty"`
5555
AllowedRegistries []string `ini:"allowed_registries,omitempty" json:"allowed_registries,omitempty"`
5656
BlockedRegistries []string `ini:"blocked_registries,omitempty" json:"blocked_registries,omitempty"`
57-
ExternalAuthEnabled bool `ini:"external_auth_enabled,omitempty" json:"external_auth_enabled,omitempty"`
57+
ExternalAuthEnabled bool `ini:"external_auth_enabled,omitempty" json:"external_auth_enabled,omitempty"`
58+
CustomProperties map[string]string `ini:"custom_properties,omitempty" json:"custom_properties,omitempty"`
5859
}

0 commit comments

Comments
 (0)