WarlockFish/fedora-infra_ansible
1
0
Fork 0
mirror of https://pagure.io/fedora-infra/ansible.git synced 2026-04-28 12:32:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

copr: change pools numbers for resalloc

Browse Source 
Adding new aws_powerful variable to group_var.
And do not prealloc too much spot and normal machines because we
have lots of reserved instances.
This commit is contained in:
Miroslav Suchý
2025-09-01 09:23:33 +02:00
parent 1af6673587
commit 7de65fa6bf
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
inventory/group_vars/copr_aws
View File

@@ -19,11 +19,14 @@ backend_base_url: "https://download.copr.fedorainfracloud.org"
builders:
# max|spawn_concurrently|prealloc
aws:
aarch64: [8, 2, 2]
aarch64: [8, 2, 1]
x86_64: [20, 4, 1]
aws_powerful:
aarch64: [10, 2, 0]
x86_64: [10, 2, 1]
aws_spot:
aarch64: [30, 4, 3]
x86_64: [70, 8, 8]
aarch64: [30, 4, 1]
x86_64: [70, 8, 1]
ppc64le_hypervisor_01:
ppc64le: [15, 4, 15]
# There's the ppc64le-test machine, so keep 2 builders less.

7
inventory/group_vars/copr_dev_aws
View File

@@ -25,8 +25,11 @@ builders:
aarch64: [2, 0, 0]
x86_64: [4, 0, 0]
aws_spot:
aarch64: [5, 1, 1]
x86_64: [5, 1, 1]
aarch64: [0, 0, 1]
x86_64: [0, 0, 1]
aws_powerful:
aarch64: [10, 1, 0]
x86_64: [10, 1, 0]
ppc64le_hypervisor_01:
ppc64le: [2, 1, 1]
ppc64le_hypervisor_02:

17
roles/copr/backend/templates/resalloc/pools.yaml.j2
View File

@@ -429,6 +429,7 @@ copr_ic_s390x_{{ zone }}_{% if devel %}dev{% else %}prod{% endif %}:
# AWS should have priority < 0 unless it is reserved instance for which we pay anyway
# reserved instances
# aws(arch, max, max_starting, max_prealloc, spot=False, on_demand=none, priority=0, reserved=False)
{% if not devel %}
{{ aws('x86_64', 47, 20, 47, priority=20, reserved=True) }}
{% endif %}
@@ -460,17 +461,17 @@ copr_ic_s390x_{{ zone }}_{% if devel %}dev{% else %}prod{% endif %}:
#### High performance builders
# priority should be less than any other normal builder. i.e., <= -40
{{ aws('x86_64', builders.aws_spot.x86_64[0], builders.aws_spot.x86_64[1],
builders.aws_spot.x86_64[2], spot=True, on_demand='powerful', priority=-40) }}
{{ aws('x86_64', builders.aws_powerful.x86_64[0], builders.aws_powerful.x86_64[1],
builders.aws_powerful.x86_64[2], spot=True, on_demand='powerful', priority=-40) }}
{{ aws('aarch64', builders.aws_spot.aarch64[0], builders.aws_spot.aarch64[1],
builders.aws_spot.aarch64[2], spot=True, on_demand='powerful', priority=-40) }}
{{ aws('aarch64', builders.aws_powerful.aarch64[0], builders.aws_powerful.aarch64[1],
builders.aws_powerful.aarch64[2], spot=True, on_demand='powerful', priority=-40) }}
{{ aws('x86_64', builders.aws_spot.x86_64[0], builders.aws_spot.x86_64[1],
builders.aws_spot.x86_64[2], on_demand='powerful', priority=-60) }}
{{ aws('x86_64', builders.aws_powerful.x86_64[0], builders.aws_powerful.x86_64[1],
builders.aws_powerful.x86_64[2], on_demand='powerful', priority=-60) }}
{{ aws('aarch64', builders.aws_spot.aarch64[0], builders.aws_spot.aarch64[1],
builders.aws_spot.aarch64[2], on_demand='powerful', priority=-60) }}
{{ aws('aarch64', builders.aws_powerful.aarch64[0], builders.aws_powerful.aarch64[1],
builders.aws_powerful.aarch64[2], on_demand='powerful', priority=-60) }}
#### Evacuate machines in older pools