copr-be: promote the new builder images to production

inventory/group_vars/copr_aws

@@ -56,11 +56,11 @@ builders:
 
 copr_builder_images:
   hypervisor:
-    x86_64: copr-builder-20210511_210127
-    ppc64le: copr-builder-ppc64le-20210713_122818
+    x86_64: copr-builder-x86_64-20211012_115536
+    ppc64le: copr-builder-ppc64le-20211012_120530
   aws:
-    x86_64: ami-05766cb7551777d09 # copr-builder-x86_64-f34-20210516_142224
-    aarch64: ami-0b7d49fecf0c393a9 # copr-builder-aarch64-f34-20210516_143216
+    x86_64: ami-0baeeebc194e64780
+    aarch64: ami-068c2760406b9e3c9
 
 aws_arch_subnets:
   x86_64:

roles/copr/backend/templates/resalloc/pools.yaml

@@ -24,7 +24,6 @@ aws_x86_64_{% if spot %}spot{% else %}normal{% endif %}_{% if devel %}dev{% else
     - arch_s390x_emulated
     - arch_noarch
     - aws
-{% if devel %}
     cmd_new: >
       /usr/bin/resalloc-aws-new
 {% if spot %}
@@ -45,10 +44,6 @@ aws_x86_64_{% if spot %}spot{% else %}normal{% endif %}_{% if devel %}dev{% else
       --tag arch=x86_64
       --playbook /var/lib/resallocserver/provision/builderpb-aws.yml
     cmd_delete: /usr/bin/resalloc-aws-delete --aws-profile default
-{% else %}
-    cmd_new: "/var/lib/resallocserver/resalloc_provision/vm-aws-new --arch=x86_64 {% if spot %}--spot{% endif %}"
-    cmd_delete: "/var/lib/resallocserver/resalloc_provision/vm-aws-delete"
-{% endif %}
     cmd_livecheck: "/var/lib/resallocserver/resalloc_provision/vm-check"
     cmd_release: "/var/lib/resallocserver/resalloc_provision/vm-release"
     livecheck_period: 180
@@ -67,7 +62,6 @@ aws_aarch64_{% if spot %}spot{% else %}normal{% endif %}_{% if devel %}dev{% els
     - arch_aarch64
     - arch_aarch64_native
     - aws
-{% if devel %}
     cmd_new: >
       /usr/bin/resalloc-aws-new
 {% if spot %}
@@ -88,10 +82,6 @@ aws_aarch64_{% if spot %}spot{% else %}normal{% endif %}_{% if devel %}dev{% els
       --tag arch=aarch64
       --playbook /var/lib/resallocserver/provision/builderpb-aws.yml
     cmd_delete: /usr/bin/resalloc-aws-delete --aws-profile default
-{% else %}
-    cmd_new: "/var/lib/resallocserver/resalloc_provision/vm-aws-new --arch=aarch64 {% if spot %}--spot{% endif %}"
-    cmd_delete: "/var/lib/resallocserver/resalloc_provision/vm-aws-delete"
-{% endif %}
     cmd_livecheck: "/var/lib/resallocserver/resalloc_provision/vm-check"
     cmd_release: "/var/lib/resallocserver/resalloc_provision/vm-release"
     livecheck_period: 180