diff --git a/inventory/group_vars/copr_dev_aws b/inventory/group_vars/copr_dev_aws index 535bc6361a..5cd38a45f5 100644 --- a/inventory/group_vars/copr_dev_aws +++ b/inventory/group_vars/copr_dev_aws @@ -63,7 +63,9 @@ copr_builder_images: ppc64le: copr-builder-ppc64le-20230608_110920 x86_64: copr-builder-x86_64-20230608_112008 ibm_cloud: - s390x: r022-520df49e-d982-4f58-9df0-f8fbda004ecf + s390x: + tokyo: r022-520df49e-d982-4f58-9df0-f8fbda004ecf + washington: 0777_f3f34148-7c23-4e94-984a-02a447f44c69 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 ca33fa574b..8f60c0f5d3 100644 --- a/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 +++ b/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 @@ -6,6 +6,7 @@ case $RESALLOC_NAME in security_group_id=r022-bf49b90e-c00f-4c68-8707-2936b47b286b ssh_key_id=r022-3918e368-8e00-4e23-9119-5e3ce1eb33bd instance_type=cz2-2x4 + image_uuid="{{ copr_builder_images.ibm_cloud.s390x.tokyo }}" 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 ;; @@ -14,6 +15,7 @@ case $RESALLOC_NAME in 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 }}" 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 ;; @@ -28,7 +30,7 @@ params=() if [ "$1" == "create" ]; then params+=( --playbook "{{ provision_directory }}/libvirt-provision.yml" - --image-uuid "{{ copr_builder_images.ibm_cloud.s390x }}" + --image-uuid "$image_uuid" --vpc-id "$vpc_id" --security-group-id "$security_group_id" --ssh-key-id "$ssh_key_id"