diff --git a/inventory/group_vars/copr_aws b/inventory/group_vars/copr_aws index 6fe944fcfb..373b727121 100644 --- a/inventory/group_vars/copr_aws +++ b/inventory/group_vars/copr_aws @@ -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. diff --git a/inventory/group_vars/copr_dev_aws b/inventory/group_vars/copr_dev_aws index d03a37d28c..ae745fe96a 100644 --- a/inventory/group_vars/copr_dev_aws +++ b/inventory/group_vars/copr_dev_aws @@ -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: diff --git a/roles/copr/backend/templates/resalloc/pools.yaml.j2 b/roles/copr/backend/templates/resalloc/pools.yaml.j2 index d5aed4d6db..15ad5374e9 100644 --- a/roles/copr/backend/templates/resalloc/pools.yaml.j2 +++ b/roles/copr/backend/templates/resalloc/pools.yaml.j2 @@ -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