diff --git a/inventory/group_vars/copr_aws b/inventory/group_vars/copr_aws index 074d42ee78..986df042e4 100644 --- a/inventory/group_vars/copr_aws +++ b/inventory/group_vars/copr_aws @@ -45,6 +45,8 @@ builders: ibm_cloud_tokyo: # tokyo is evacuated s390x: [0, 6, 6] + ibm_cloud_spaulo: + s390x: [0, 0, 0] copr_aws_region: us-east-1 # don't forget to update ip in ./copr-keygen, due to custom firewall rules diff --git a/inventory/group_vars/copr_dev_aws b/inventory/group_vars/copr_dev_aws index 840bd1031d..77e2cc5780 100644 --- a/inventory/group_vars/copr_dev_aws +++ b/inventory/group_vars/copr_dev_aws @@ -46,6 +46,8 @@ builders: ibm_cloud_tokyo: # tokyo is evacuated s390x: [0, 0, 0] + ibm_cloud_spaulo: + s390x: [1, 0, 0] copr_aws_region: us-east-1 # don't forget to update ip in ./copr-keygen-stg, due to custom firewall rules @@ -74,6 +76,7 @@ copr_builder_images: tokyo: r022-3bca519e-3cc7-432e-9280-8ff89738e3a5 # n-1: us_east: r014-1469fafc-d906-44fa-b780-e4599ed56fde us_east: r014-9ba4feec-ce45-4401-acea-f123114685b5 + sao: r042-5e105a96-4a84-4c07-950b-9fd12d58c8a2 osuosl: # ppc64le: copr-builder-ppc64le-20240206_143009 ppc64le: copr-builder-ppc64le-20241119_171239 diff --git a/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 b/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 index 50320ad260..ed2c90d754 100644 --- a/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 +++ b/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 @@ -10,6 +10,16 @@ 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 ;; + *s390x*sao*) + vpc_id=r042-c902f12d-556f-4334-95cb-d181ebb3d8ba + security_group_id=r042-22ef3881-fa20-4caa-9873-c8dc41c5dcb7 + ssh_key_id=r042-4fb65a23-e7bd-440f-8d71-ff57b83a4152 + instance_type=mz2-2x16 + additional_volume_size=160 + image_uuid="{{ copr_builder_images.ibm_cloud.s390x.sao }}" + subnets_ids="br-sao-1:02t7-1c0b186a-ca5e-44ea-bf2c-ca2f3122a9ff br-sao-2:02u7-75fa6c55-b65a-4d38-a011-15559c7171ce br-sao-3:02v7-439195e6-2df0-4720-9696-76d0a63c352d" + zone=br-sao + ;; *s390x*us_east*) vpc_id=r014-e90f14b0-a9c0-4c0b-bc81-207904b2d19e security_group_id=r014-941706bd-062c-4d4c-9512-9a31b8f257d7 diff --git a/roles/copr/backend/templates/resalloc/pools.yaml b/roles/copr/backend/templates/resalloc/pools.yaml index 1bf5227d06..9743cd813b 100644 --- a/roles/copr/backend/templates/resalloc/pools.yaml +++ b/roles/copr/backend/templates/resalloc/pools.yaml @@ -253,6 +253,33 @@ copr_ic_s390x_{{ t + '_' if t or '' }}us_east_{% if devel %}dev{% else %}prod{% {% endfor %} +copr_ic_s390x_br_sao_{% if devel %}dev{% else %}prod{% endif %}: + max: {{ builders.ibm_cloud_spaulo.s390x[0] }} +{% if not devel %} + max_prealloc: 0 # {{ builders.ibm_cloud_us_east.s390x[1] }} +{% endif %} + max_starting: {{ builders.ibm_cloud_us_east.s390x[2] }} + tags: + - copr_builder + - name: arch_noarch + priority: -30 + - ibm_cloud + - us_east +{% if devel %} + tags_on_demand: +{% endif %} + - name: arch_s390x_native + - name: arch_s390x + cmd_new: '/var/lib/resallocserver/resalloc_provision/ibm-cloud-vm create "$RESALLOC_NAME"' + cmd_delete: "/var/lib/resallocserver/resalloc_provision/vm-delete" + cmd_livecheck: "resalloc-check-vm-ip" + cmd_release: "/var/lib/resallocserver/resalloc_provision/vm-release" + cmd_list: "/var/lib/resallocserver/resalloc_provision/ibm-cloud-list-vms" + livecheck_period: 180 + reuse_opportunity_time: 45 + reuse_max_count: 8 + reuse_max_time: 1800 + # Power9 VMs in openpower-controller.osuosl.org copr_osuosl_p09_{% if devel %}dev{% else %}prod{% endif %}: {% if devel %}