Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

copr-be: start at most 2 powerful s390x instances

Browse source
This commit is contained in:
Pavel Raiskup 2024-01-09 16:50:41 +01:00
parent 209bc02e78
commit 23f1e61adf
2 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2
View file

@ -14,7 +14,14 @@ case $RESALLOC_NAME in
vpc_id=r014-e90f14b0-a9c0-4c0b-bc81-207904b2d19e vpc_id=r014-e90f14b0-a9c0-4c0b-bc81-207904b2d19e
security_group_id=r014-941706bd-062c-4d4c-9512-9a31b8f257d7 security_group_id=r014-941706bd-062c-4d4c-9512-9a31b8f257d7
ssh_key_id=r014-fc1c1b90-5a7f-4cc6-a6d4-b273bd19be99 ssh_key_id=r014-fc1c1b90-5a7f-4cc6-a6d4-b273bd19be99
instance_type=mz2-2x16 case $RESALLOC_NAME in
*powerful*)
instance_type=bz2-16x64
;;
*)
instance_type=mz2-2x16
;;
esac
image_uuid="{{ copr_builder_images.ibm_cloud.s390x.us_east }}" 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" 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 zone=us-east

14
roles/copr/backend/templates/resalloc/pools.yaml
View file

@ -210,23 +210,32 @@ copr_ibm_cloud_s390x_tokyo_{% if devel %}dev{% else %}prod{% endif %}:
# Z Cloud instances in Washington # Z Cloud instances in Washington
copr_ic_s390x_us_east_{% if devel %}dev{% else %}prod{% endif %}: {% for t in ['', 'powerful'] %}
copr_ic_s390x_{{ t + '_' if t or '' }}us_east_{% if devel %}dev{% else %}prod{% endif %}:
{% if not t %}
max: {{ builders.ibm_cloud_us_east.s390x[0] }} max: {{ builders.ibm_cloud_us_east.s390x[0] }}
{% if not devel %} {% if not devel %}
max_prealloc: {{ builders.ibm_cloud_us_east.s390x[1] }} max_prealloc: {{ builders.ibm_cloud_us_east.s390x[1] }}
{% endif %} {% endif %}
max_starting: {{ builders.ibm_cloud_us_east.s390x[2] }} max_starting: {{ builders.ibm_cloud_us_east.s390x[2] }}
{% else %}
max: 2
max_starting: 2
{% endif %}
tags: tags:
- copr_builder - copr_builder
- name: arch_noarch - name: arch_noarch
priority: -30 priority: -30
- ibm_cloud - ibm_cloud
- us_east - us_east
{% if devel %} {% if devel or t == 'powerful' %}
tags_on_demand: tags_on_demand:
{% endif %} {% endif %}
- arch_s390x - arch_s390x
- arch_s390x_native - arch_s390x_native
{% if t == 'powerful' %}
- on_demand_powerful
{% endif %}
cmd_new: '/var/lib/resallocserver/resalloc_provision/ibm-cloud-vm create "$RESALLOC_NAME"' cmd_new: '/var/lib/resallocserver/resalloc_provision/ibm-cloud-vm create "$RESALLOC_NAME"'
cmd_delete: "/var/lib/resallocserver/resalloc_provision/vm-delete" cmd_delete: "/var/lib/resallocserver/resalloc_provision/vm-delete"
cmd_livecheck: "resalloc-check-vm-ip" cmd_livecheck: "resalloc-check-vm-ip"
@ -237,6 +246,7 @@ copr_ic_s390x_us_east_{% if devel %}dev{% else %}prod{% endif %}:
reuse_max_count: 8 reuse_max_count: 8
reuse_max_time: 1800 reuse_max_time: 1800
{% endfor %}
# Power9 VMs in openpower-controller.osuosl.org # Power9 VMs in openpower-controller.osuosl.org
copr_osuosl_p09_{% if devel %}dev{% else %}prod{% endif %}: copr_osuosl_p09_{% if devel %}dev{% else %}prod{% endif %}: