From 90ebfe5620ec0637cf88eb003c098ebd4efca55f Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 17 May 2021 10:54:59 +0200 Subject: [PATCH] copr-be: promote tested builder images to production And turn on the builders on hypervisors. --- inventory/group_vars/copr_back_aws | 6 ++++-- roles/copr/backend/templates/resalloc/pools.yaml | 8 ++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/inventory/group_vars/copr_back_aws b/inventory/group_vars/copr_back_aws index 9e3151c9f0..d67b6a7d92 100644 --- a/inventory/group_vars/copr_back_aws +++ b/inventory/group_vars/copr_back_aws @@ -16,9 +16,11 @@ copr_builder_images: x86_64: copr-builder-x86_64-f32-20200914_072608 ppc64le: copr-builder-ppc64le-f31-20200117_132023 aarch64: copr-builder-aarch64-f32-20200914_073754 + hypervisor: + x86_64: copr-builder-20210511_210127 aws: - x86_64: ami-05655b44ed8d4f869 # copr-builder-x86_64-f33-20210119_150254 - aarch64: ami-0e26990bd41c19eba # copr-builder-aarch64-f33-20210119_145252 + x86_64: ami-05766cb7551777d09 # copr-builder-x86_64-f34-20210516_142224 + aarch64: ami-0b7d49fecf0c393a9 # copr-builder-aarch64-f34-20210516_143216 nrpe_procs_warn: 2200 nrpe_procs_crit: 2500 diff --git a/roles/copr/backend/templates/resalloc/pools.yaml b/roles/copr/backend/templates/resalloc/pools.yaml index 9a5a29f145..c3e7b0624b 100644 --- a/roles/copr/backend/templates/resalloc/pools.yaml +++ b/roles/copr/backend/templates/resalloc/pools.yaml @@ -47,12 +47,17 @@ aws_aarch64_normal_{% if devel %}dev{% else %}prod{% endif %}: {% endmacro %} # x86_64 hypervisors -{% if devel %} {% for hv in ["02", "03", "04"] %} copr_hv_x86_64_{{ hv }}_{% if devel %}dev{% else %}prod{% endif %}: +{% if devel %} max: 3 max_starting: 1 max_prealloc: 1 +{% else %} + max: 20 + max_starting: 4 + max_prealloc: 20 +{% endif %} tags: - copr_builder - arch_x86_64 @@ -78,7 +83,6 @@ copr_hv_x86_64_{{ hv }}_{% if devel %}dev{% else %}prod{% endif %}: reuse_max_count: 8 reuse_max_time: 1800 {% endfor %} -{% endif %} {% macro hw_aarch64(id, inst, max, max_starting, max_prealloc) %} aarch64_{{ id }}_{{ inst }}: