jcline/ansible
1
0
Fork 0
forked from infra/ansible
Code Pull requests Activity

copr: bring back s390x

Browse source
This commit is contained in:
Jiri Kyjovsky 2026-04-30 20:22:14 +02:00
commit f6d0fec7f2
3 changed files with 18 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

18
inventory/group_vars/copr_aws
View file

@ -62,36 +62,36 @@ builders:
s390x: [2, 1, 0]
ibm_cloud_br_sao_1:
s390x: [3, 1, 1]
s390x: [5, 5, 1]
ibm_cloud_br_sao_2:
s390x: [3, 1, 1]
s390x: [5, 5, 1]
ibm_cloud_br_sao_3:
s390x: [3, 1, 1]
s390x: [5, 5, 1]
ibm_cloud_eu_es_1:
s390x: [3, 1, 1]
s390x: [5, 5, 1]
ibm_cloud_eu_es_2:
s390x: [3, 1, 1]
s390x: [5, 5, 1]
ibm_cloud_eu_es_3:
s390x: [3, 1, 1]
s390x: [5, 5, 1]
cloud_instance_types:
ibm_cloud:
s390x: mz2-2x16
s390x: bz2-2x8
s390x_hp: bz2-16x64
ibm_cloud_regions:
eu_es:
name: eu-es
name_humans: Madrid, Spain
ssh_key: r050-cbd10ece-a28f-45c8-bc3a-15ecb9ff66d5
ssh_key: r050-4e396a17-294c-4197-9c56-e126185025a1
vpc: r050-190b8bac-3bae-47cf-9be7-ac70fc54ccb9
security_group: r050-cfc3db07-8cde-4807-9756-db91b242092a
images: "{{ copr_builder_images.ibm_cloud.eu_es }}"
br_sao:
name: br-sao
name_humans: Sao Paulo, Brazil
ssh_key: r042-4fb65a23-e7bd-440f-8d71-ff57b83a4152
ssh_key: r042-b30ff308-ef4f-43bf-bdd6-e16f1cc614cd
vpc: r042-c902f12d-556f-4334-95cb-d181ebb3d8ba
security_group: r042-22ef3881-fa20-4caa-9873-c8dc41c5dcb7
images: "{{ copr_builder_images.ibm_cloud.br_sao }}"

16
inventory/group_vars/copr_dev_aws
View file

@ -64,34 +64,34 @@ builders:
ibm_cloud_br_sao_1:
s390x: [1, 1, 0]
ibm_cloud_br_sao_2:
s390x: [1, 1, 0]
s390x: [0, 0, 0]
ibm_cloud_br_sao_3:
s390x: [1, 1, 0]
s390x: [0, 0, 0]
ibm_cloud_eu_es_1:
s390x: [1, 1, 0]
s390x: [0, 0, 0]
ibm_cloud_eu_es_2:
s390x: [1, 1, 0]
s390x: [0, 0, 0]
ibm_cloud_eu_es_3:
s390x: [1, 1, 0]
s390x: [0, 0, 0]
cloud_instance_types:
ibm_cloud:
s390x: mz2-2x16
s390x: bz2-2x8
s390x_hp: bz2-16x64
ibm_cloud_regions:
eu_es:
name: eu-es
name_humans: Madrid, Spain
ssh_key: r050-cbd10ece-a28f-45c8-bc3a-15ecb9ff66d5
ssh_key: r050-ea3b598c-39ca-4963-b8ef-c9d6ac146fad
vpc: r050-190b8bac-3bae-47cf-9be7-ac70fc54ccb9
security_group: r050-cfc3db07-8cde-4807-9756-db91b242092a
images: "{{ copr_builder_images.ibm_cloud.eu_es }}"
br_sao:
name: br-sao
name_humans: Sao Paulo, Brazil
ssh_key: r042-4fb65a23-e7bd-440f-8d71-ff57b83a4152
ssh_key: r042-3ec7f0e1-3eb3-4f55-a922-915c85da09c2
vpc: r042-c902f12d-556f-4334-95cb-d181ebb3d8ba
security_group: r042-22ef3881-fa20-4caa-9873-c8dc41c5dcb7
images: "{{ copr_builder_images.ibm_cloud.br_sao }}"

7
roles/copr/backend/templates/resalloc/pools.yaml.j2
View file

@ -61,8 +61,6 @@ aws_{{ arch }}_{{ on_demand + '_' if on_demand is not none else '' }}{% if spot
- arch_armhfp_emulated
- arch_riscv64
- arch_riscv64_emulated
- arch_s390x
- arch_s390x_emulated
{% else %}
- arch_aarch64
- arch_aarch64_native
@ -227,8 +225,6 @@ vmhost_x86_{{ hv }}_{% if devel %}dev{% else %}prod{% endif %}:
- arch_armhfp_emulated
- arch_riscv64
- arch_riscv64_emulated
- arch_s390x
- arch_s390x_emulated
- hypervisor
- hypervisor_x86_64
- hypervisor_x86_64_{{ hv }}
@ -384,7 +380,7 @@ copr_ic_s390x_hp_us_east_{% if devel %}dev{% else %}prod{% endif %}:
description: >
A pool of high-performance s390x instances in the IBM Cloud, Washington, D.C. (us-east).
Thanks to IBM for sponsoring these builders.
#}
{% for zone in ['br_sao_1', 'br_sao_2', 'br_sao_3', 'eu_es_1', 'eu_es_2', 'eu_es_3'] %}
copr_ic_s390x_{{ zone }}_{% if devel %}dev{% else %}prod{% endif %}:
@ -439,7 +435,6 @@ copr_ic_s390x_{{ zone }}_{% if devel %}dev{% else %}prod{% endif %}:
Thanks to IBM for sponsoring these builders.
{% endfor %}
#}
# Power9 builders in OSU osuosl
{{ osuosl_p09_p10() }}