diff --git a/roles/copr/backend/templates/copr-be.conf.j2 b/roles/copr/backend/templates/copr-be.conf.j2 index 6139192817..a8537e0805 100644 --- a/roles/copr/backend/templates/copr-be.conf.j2 +++ b/roles/copr/backend/templates/copr-be.conf.j2 @@ -41,7 +41,7 @@ sleeptime=20 builds_max_workers={{ max_workers }} # Maximum number of concurrently running tasks per architecture. Since we -# emulate s390x and armhfp on x86_64, we give it ~25% of the x86_64 quota. +# emulate s390x, armhfp and riscv64 on x86_64, we give it ~25% of the x86_64 quota. # The 32bit x86 variants (i386, i586 and i686) are in minority now, so let's # limit them as well. builds_max_workers_arch= @@ -52,7 +52,8 @@ builds_max_workers_arch= i386={{ (max_x86_64_workers|int / 5)|int }}, i586={{ (max_x86_64_workers|int / 4)|int }}, i686={{ (max_x86_64_workers|int / 5)|int }}, - ppc64le={{ max_ppc64le_workers }} + ppc64le={{ max_ppc64le_workers }}, + riscv64={{ (max_x86_64_workers|int / 5)|int }} # Do not let one user waste the whole architecture capacity builds_max_workers_arch_per_owner=s390x=4 diff --git a/roles/copr/backend/templates/resalloc/pools.yaml.j2 b/roles/copr/backend/templates/resalloc/pools.yaml.j2 index 0fc70c55af..3c786ec4a4 100644 --- a/roles/copr/backend/templates/resalloc/pools.yaml.j2 +++ b/roles/copr/backend/templates/resalloc/pools.yaml.j2 @@ -54,6 +54,8 @@ aws_{{ arch }}_{{ on_demand + '_' if on_demand is not none else '' }}{% if spot - arch_i686_native - arch_armhfp - arch_armhfp_emulated + - arch_riscv64 + - arch_riscv64_emulated {% else %} - arch_aarch64 - arch_aarch64_native @@ -214,6 +216,8 @@ vmhost_x86_{{ hv }}_{% if devel %}dev{% else %}prod{% endif %}: - arch_i686_native - arch_armhfp - arch_armhfp_emulated + - arch_riscv64 + - arch_riscv64_emulated - hypervisor - hypervisor_x86_64 - hypervisor_x86_64_{{ hv }} diff --git a/roles/copr/frontend/files/chroots.conf b/roles/copr/frontend/files/chroots.conf index 8e0b234cba..ca7ffaafe2 100644 --- a/roles/copr/frontend/files/chroots.conf +++ b/roles/copr/frontend/files/chroots.conf @@ -15,4 +15,8 @@ config["rules"] = [{ "match_type": "arch", "match": ["armhfp"], "comment": "An emulated chroot. Builds are done on x86_64.", +}, { + "match_type": "arch", + "match": ["riscv64"], + "comment": "An emulated chroot. Builds are done on x86_64 using QEMU.", }]