From 7af520179b6ed34db96b7fa23976e32a555a832e Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Tue, 24 Oct 2023 18:49:37 +0200
Subject: [PATCH] =?UTF-8?q?copr-be-dev:=20move=20builders=20Tokyo=20?=
 =?UTF-8?q?=E2=86=92=20Washington,=20take=20#4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Too long instance names causing weird errors, shorten!
https://github.com/fedora-copr/resalloc-ibm-cloud/pull/19
---
 inventory/group_vars/copr_dev_aws                     |  4 ++--
 roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 |  6 +++---
 roles/copr/backend/templates/resalloc/pools.yaml      | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/inventory/group_vars/copr_dev_aws b/inventory/group_vars/copr_dev_aws
index 025bf12a08..a7e7b828eb 100644
--- a/inventory/group_vars/copr_dev_aws
+++ b/inventory/group_vars/copr_dev_aws
@@ -40,7 +40,7 @@ builders:
     x86_64: [2, 1, 1]
   x86_hypervisor_04:
     x86_64: [2, 1, 1]
-  ibm_cloud_washington:
+  ibm_cloud_us_east:
     # s390x is on-demand
     s390x: [2, 0, 1]
   ibm_cloud_tokyo:
@@ -65,7 +65,7 @@ copr_builder_images:
   ibm_cloud:
     s390x:
       tokyo: r022-520df49e-d982-4f58-9df0-f8fbda004ecf
-      washington: r014-28482f8a-f9aa-421a-a140-ffa1539d1c56
+      us_east: : r014-28482f8a-f9aa-421a-a140-ffa1539d1c56
   osuosl:
     ppc64le: copr-builder-ppc64le-20230608_110920
 
diff --git a/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 b/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2
index 8f60c0f5d3..86e104eb20 100644
--- a/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2
+++ b/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 case $RESALLOC_NAME in
-    *tokyo*)
+    *s390x*tokyo*)
         vpc_id=r022-8438169e-d881-4bda-b603-d31fdf0f8b3a
         security_group_id=r022-bf49b90e-c00f-4c68-8707-2936b47b286b
         ssh_key_id=r022-3918e368-8e00-4e23-9119-5e3ce1eb33bd
@@ -10,12 +10,12 @@ case $RESALLOC_NAME in
         subnets_ids="jp-tok-1:02e7-84755ffa-97bb-4067-b618-24c788c901cb jp-tok-2:02f7-98674f68-aae1-4ea1-a889-5a0b7a07f4b8 jp-tok-3:02g7-6d92562d-b868-411f-a962-99271d609ba6"
         zone=jp-tok
         ;;
-    *washington*)
+    *s390x*us_east*)
         vpc_id=r014-e90f14b0-a9c0-4c0b-bc81-207904b2d19e
         security_group_id=r014-941706bd-062c-4d4c-9512-9a31b8f257d7
         ssh_key_id=r014-fc1c1b90-5a7f-4cc6-a6d4-b273bd19be99
         instance_type=cz2-2x4
-        image_uuid="{{ copr_builder_images.ibm_cloud.s390x.washington }}"
+        image_uuid="{{ copr_builder_images.ibm_cloud.s390x.us_east }}"
         subnets_ids="us-east-1:0757-df8209fd-e4e4-4659-bcca-b60c9eddfb35 us-east-2:0767-4cb7e11d-14db-48a8-9d1d-c59679112cd5 us-east-3:0777-bc697f15-4f13-4843-b338-d8950e3d23c0"
         zone=us-east
         ;;
diff --git a/roles/copr/backend/templates/resalloc/pools.yaml b/roles/copr/backend/templates/resalloc/pools.yaml
index f6b981fbfe..4605e4b879 100644
--- a/roles/copr/backend/templates/resalloc/pools.yaml
+++ b/roles/copr/backend/templates/resalloc/pools.yaml
@@ -198,18 +198,18 @@ copr_ibm_cloud_s390x_tokyo_{% if devel %}dev{% else %}prod{% endif %}:
 
 
 # Z Cloud instances in Washington
-copr_ibm_cloud_s390x_washington_{% if devel %}dev{% else %}prod{% endif %}:
-  max: {{ builders.ibm_cloud_washington.s390x[0] }}
+copr_ic_s390x_us_east_{% if devel %}dev{% else %}prod{% endif %}:
+  max: {{ builders.ibm_cloud_us_east.s390x[0] }}
 {% if not devel %}
-  max_prealloc: {{ builders.ibm_cloud_washington.s390x[1] }}
+  max_prealloc: {{ builders.ibm_cloud_us_east.s390x[1] }}
 {% endif %}
-  max_starting: {{ builders.ibm_cloud_washington.s390x[2] }}
+  max_starting: {{ builders.ibm_cloud_us_east.s390x[2] }}
   tags:
     - copr_builder
     - name: arch_noarch
       priority: -30
     - ibm_cloud
-    - washington
+    - us_east
 {% if devel %}
   tags_on_demand:
 {% endif %}