Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion terraform/modules/autoscaler/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ resource "aws_autoscaling_group" "agents" {
instances_distribution {
on_demand_base_capacity = var.on_demand_base_capacity
on_demand_percentage_above_base_capacity = var.on_demand_percentage_above_base_capacity
spot_allocation_strategy = "capacity-optimized"
spot_allocation_strategy = "price-capacity-optimized"
}

launch_template {
Expand Down
10 changes: 5 additions & 5 deletions terraform/vars/tvm-ci-prod.auto.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ autoscaler_types = {
labels = "CPU"
min_size = 0
max_size = 90
on_demand_percentage_above_base_capacity = 100
on_demand_percentage_above_base_capacity = 30
on_demand_base_capacity = 0
}
"Prod-Autoscaler-Jenkins-CPU-SPOT" = {
Expand All @@ -44,7 +44,7 @@ autoscaler_types = {
labels = "CPU-SPOT"
min_size = 0
max_size = 90
on_demand_percentage_above_base_capacity = 0
on_demand_percentage_above_base_capacity = 30
on_demand_base_capacity = 0
}
"Prod-Autoscaler-Jenkins-CPU-Small" = {
Expand All @@ -62,7 +62,7 @@ autoscaler_types = {
labels = "CPU-SMALL-SPOT"
min_size = 0
max_size = 100
on_demand_percentage_above_base_capacity = 0
on_demand_percentage_above_base_capacity = 30
on_demand_base_capacity = 0
}
"Prod-Autoscaler-Jenkins-GPU" = {
Expand All @@ -81,7 +81,7 @@ autoscaler_types = {
labels = "GPU-SPOT"
min_size = 8
max_size = 64
on_demand_percentage_above_base_capacity = 0
on_demand_percentage_above_base_capacity = 30
on_demand_base_capacity = 0
additional_instance_types = ["g5.2xlarge", "g5.4xlarge", "g6.xlarge", "g6.2xlarge", "g6.4xlarge"]
}
Expand Down Expand Up @@ -109,7 +109,7 @@ autoscaler_types = {
labels = "ARM-GRAVITON3-SPOT"
min_size = 0
max_size = 90
on_demand_percentage_above_base_capacity = 0
on_demand_percentage_above_base_capacity = 30
on_demand_base_capacity = 0
}
}
Expand Down
Loading