From 4bc27555b73d0f964f107d7c677a1a082dbbe778 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 27 May 2019 15:32:23 +0200 Subject: [PATCH] copr: enable aarch64 builders in production --- roles/copr/backend/tasks/main.yml | 1 - roles/copr/backend/templates/copr-be.conf.j2 | 8 +------- roles/copr/backend/templates/resalloc/pools.yaml | 3 +-- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml index 566769c7e5..64fedc5757 100644 --- a/roles/copr/backend/tasks/main.yml +++ b/roles/copr/backend/tasks/main.yml @@ -138,7 +138,6 @@ - name: resalloc import_tasks: resalloc.yml - when: devel tags: - resalloc diff --git a/roles/copr/backend/templates/copr-be.conf.j2 b/roles/copr/backend/templates/copr-be.conf.j2 index 9ca71a33f5..a3662951aa 100644 --- a/roles/copr/backend/templates/copr-be.conf.j2 +++ b/roles/copr/backend/templates/copr-be.conf.j2 @@ -26,12 +26,7 @@ frontend_auth={{ copr_backend_password }} # vm_max_check_fails=2 - when machine is consequently X times marked as failed then it is terminated # vm_terminating_timeout=600 - when machine was terminated and terminate PB did not finish within this number of second, we will run the PB once again. -{% if devel %} -# TODO: swap to 3 also on production build_groups=3 -{% else %} -build_groups=2 -{% endif %} group0_name=PC group0_archs=i386,x86_64,i586 @@ -73,8 +68,7 @@ group2_terminate_playbook=/home/copr/provision/terminatepb_libvirt_aarch64.yml group2_vm_health_check_period=30 group2_vm_health_check_max_time=120 -# TODO: switch devel/production -{% if devel %} +{% if not devel %} group2_max_vm_per_user=4 group2_max_vm_total=8 # we can not over-load hypervisors, there's max-spawn limit in resalloc config diff --git a/roles/copr/backend/templates/resalloc/pools.yaml b/roles/copr/backend/templates/resalloc/pools.yaml index c1ad75fd3a..529687de43 100644 --- a/roles/copr/backend/templates/resalloc/pools.yaml +++ b/roles/copr/backend/templates/resalloc/pools.yaml @@ -1,5 +1,4 @@ -# TODO: s/devel/not devel/ -{% if devel %} +{% if not devel %} # Production configuration. On each aarch64 host we have # 2 guests VMs of # - 10 VCPUs