From 0b849b58362b671a5e3b4779cf0b28840ed4b649 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Mon, 23 Oct 2023 21:47:14 +0200
Subject: [PATCH] copr-be: new AWS EC2 instance types

Per the research in:
https://github.com/fedora-copr/copr/issues/2241
---
 .../backend/templates/provision/copr-resalloc-aws-new.j2    | 2 --
 roles/copr/backend/templates/resalloc/pools.yaml            | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/roles/copr/backend/templates/provision/copr-resalloc-aws-new.j2 b/roles/copr/backend/templates/provision/copr-resalloc-aws-new.j2
index a51c332ad6..17c70deffc 100644
--- a/roles/copr/backend/templates/provision/copr-resalloc-aws-new.j2
+++ b/roles/copr/backend/templates/provision/copr-resalloc-aws-new.j2
@@ -24,9 +24,7 @@ cmd=(
       --tag CoprPurpose=builder
       --tag CoprInstance={% if devel %}devel{% else %}production{% endif %}
       --tag arch={{ item }}
-{% if item == 'aarch64' %}
       --additional-volume-size 160
-{% endif %}
       --playbook /var/lib/resallocserver/provision/builderpb-aws.yml
 )
 
diff --git a/roles/copr/backend/templates/resalloc/pools.yaml b/roles/copr/backend/templates/resalloc/pools.yaml
index 939ddbdf14..9a8dfeb108 100644
--- a/roles/copr/backend/templates/resalloc/pools.yaml
+++ b/roles/copr/backend/templates/resalloc/pools.yaml
@@ -38,13 +38,13 @@ aws_{{ arch }}_{{ on_demand + '_' if on_demand is not none else '' }}{% if spot
 {% endif %}
 
 {% if arch == 'x86_64' and on_demand is none %}
-{% set itype='i4i.large' %}
+{% set itype='c7i.xlarge' %}
 {% elif arch == 'x86_64' and on_demand == 'powerful' %}
-{% set itype='r7a.16xlarge' %}
+{% set itype='c7i.8xlarge' %}
 {% elif arch == 'aarch64' and on_demand is none %}
 {% set itype='c7g.xlarge' %}
 {% elif arch == 'aarch64' and on_demand == 'powerful' %}
-{% set itype='r7g.16xlarge' %}
+{% set itype='c7g.8xlarge' %}
 {% endif %}
 
 {% if spot and on_demand == 'powerful' %}