From a50e77a51e9320f90639e5126ee5213ac4ae1962 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sat, 21 Dec 2024 00:18:46 +0100 Subject: [PATCH] copr-be: start s390x machines also in Madrid --- inventory/group_vars/copr_aws | 3 +++ inventory/group_vars/copr_dev_aws | 3 +++ .../templates/resalloc/ibm-cloud-list-vms.j2 | 6 +++++ .../templates/resalloc/ibm-cloud-vm.j2 | 10 +++++++ .../backend/templates/resalloc/pools.yaml | 27 +++++++++++++++++++ 5 files changed, 49 insertions(+) diff --git a/inventory/group_vars/copr_aws b/inventory/group_vars/copr_aws index 048d1de6e5..7021d49c6f 100644 --- a/inventory/group_vars/copr_aws +++ b/inventory/group_vars/copr_aws @@ -47,6 +47,8 @@ builders: s390x: [0, 6, 6] ibm_cloud_spaulo: s390x: [9, 3, 3] + ibm_cloud_madrid: + s390x: [9, 3, 3] copr_aws_region: us-east-1 # don't forget to update ip in ./copr-keygen, due to custom firewall rules @@ -74,6 +76,7 @@ copr_builder_images: # 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 + madrid: r050-053cfdb8-52eb-486d-b8b3-bc9cba2fbe56 osuosl: # ppc64le: copr-builder-ppc64le-20240206_143009 ppc64le: copr-builder-ppc64le-20241119_171239 diff --git a/inventory/group_vars/copr_dev_aws b/inventory/group_vars/copr_dev_aws index 890b21bbbc..9034be4744 100644 --- a/inventory/group_vars/copr_dev_aws +++ b/inventory/group_vars/copr_dev_aws @@ -47,6 +47,8 @@ builders: # tokyo is evacuated s390x: [0, 0, 0] ibm_cloud_spaulo: + s390x: [0, 0, 0] + ibm_cloud_madrid: 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 @@ -77,6 +79,7 @@ copr_builder_images: # 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 + madrid: r050-053cfdb8-52eb-486d-b8b3-bc9cba2fbe56 osuosl: # ppc64le: copr-builder-ppc64le-20240206_143009 ppc64le: copr-builder-ppc64le-20241119_171239 diff --git a/roles/copr/backend/templates/resalloc/ibm-cloud-list-vms.j2 b/roles/copr/backend/templates/resalloc/ibm-cloud-list-vms.j2 index 4f1b4dd3fd..732c8b5ee6 100644 --- a/roles/copr/backend/templates/resalloc/ibm-cloud-list-vms.j2 +++ b/roles/copr/backend/templates/resalloc/ibm-cloud-list-vms.j2 @@ -7,6 +7,12 @@ case $RESALLOC_POOL_ID in *s390x*us_east*) zone=us-east ;; + *s390x*sao*) + zone=br-sao + ;; + *s390x*madrid*) + zone=eu-es + ;; *) echo "Can't decide what location to assign from pool id: '$RESALLOC_POOL_ID'" exit 1 diff --git a/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 b/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 index ed2c90d754..c3224dc1ac 100644 --- a/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 +++ b/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 @@ -20,6 +20,16 @@ case $RESALLOC_NAME in 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*madrid*) + vpc_id=r050-190b8bac-3bae-47cf-9be7-ac70fc54ccb9 + security_group_id=r050-cfc3db07-8cde-4807-9756-db91b242092a + ssh_key_id=r050-cbd10ece-a28f-45c8-bc3a-15ecb9ff66d5 + instance_type=mz2-2x16 + additional_volume_size=160 + image_uuid="{{ copr_builder_images.ibm_cloud.s390x.madrid }}" + subnets_ids="eu-es-1:02w7-84eded83-3077-44c3-a84c-90c7afb7ff4f eu-es-2:02x7-05de0643-b257-4500-9a14-648421b16738 eu-es-3:02y7-e32873a0-ad98-44d5-b49d-da49f731a914" + zone=eu-es + ;; *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 fe5e1be8a6..30db9af868 100644 --- a/roles/copr/backend/templates/resalloc/pools.yaml +++ b/roles/copr/backend/templates/resalloc/pools.yaml @@ -280,6 +280,33 @@ copr_ic_s390x_br_sao_{% if devel %}dev{% else %}prod{% endif %}: reuse_max_count: 8 reuse_max_time: 1800 +copr_ic_s390x_madrid_{% if devel %}dev{% else %}prod{% endif %}: + max: {{ builders.ibm_cloud_madrid.s390x[0] }} +{% if not devel %} + max_prealloc: {{ builders.ibm_cloud_madrid.s390x[1] }} +{% endif %} + max_starting: {{ builders.ibm_cloud_madrid.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 %}