diff --git a/inventory/group_vars/copr_dev_aws b/inventory/group_vars/copr_dev_aws index 08cfde8cee..535bc6361a 100644 --- a/inventory/group_vars/copr_dev_aws +++ b/inventory/group_vars/copr_dev_aws @@ -40,9 +40,12 @@ builders: x86_64: [2, 1, 1] x86_hypervisor_04: x86_64: [2, 1, 1] - ibm_cloud_tokyo: + ibm_cloud_washington: # s390x is on-demand s390x: [2, 0, 1] + ibm_cloud_tokyo: + # tokyo is evacuated + s390x: [0, 0, 0] copr_aws_region: us-east-1 # don't forget to update ip in ./copr-keygen-stg, due to custom firewall rules diff --git a/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 b/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 index 5f48f5c997..ca33fa574b 100644 --- a/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 +++ b/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 @@ -9,6 +9,14 @@ 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*) + 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 + 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 + ;; *) echo "Can't decide what location to assign from: $RESALLOC_NAME" exit 1 diff --git a/roles/copr/backend/templates/resalloc/pools.yaml b/roles/copr/backend/templates/resalloc/pools.yaml index 5be6b72910..f6b981fbfe 100644 --- a/roles/copr/backend/templates/resalloc/pools.yaml +++ b/roles/copr/backend/templates/resalloc/pools.yaml @@ -168,7 +168,7 @@ copr_p09_{{ hv }}_{% if devel %}dev{% else %}prod{% endif %}: {% endif %} {% endfor %} -# Z Cloud instances +# Z Cloud instances Tokyo copr_ibm_cloud_s390x_tokyo_{% if devel %}dev{% else %}prod{% endif %}: max: {{ builders.ibm_cloud_tokyo.s390x[0] }} {% if not devel %} @@ -196,6 +196,36 @@ copr_ibm_cloud_s390x_tokyo_{% if devel %}dev{% else %}prod{% endif %}: reuse_max_count: 8 reuse_max_time: 1800 + +# Z Cloud instances in Washington +copr_ibm_cloud_s390x_washington_{% if devel %}dev{% else %}prod{% endif %}: + max: {{ builders.ibm_cloud_washington.s390x[0] }} +{% if not devel %} + max_prealloc: {{ builders.ibm_cloud_washington.s390x[1] }} +{% endif %} + max_starting: {{ builders.ibm_cloud_washington.s390x[2] }} + tags: + - copr_builder + - name: arch_noarch + priority: -30 + - ibm_cloud + - washington +{% if devel %} + tags_on_demand: +{% endif %} + - arch_s390x + - arch_s390x_native + 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: 90 + 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 %}