Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ summarized below:
| Type | Families |
| ------------- | -------------- |
| rhel | rhel-7 <br> rhel-8 |
| rhel-s390x | rhel-8-6-s390x |
| rhel-s390x | rhel-8-6-s390x <br> rhel-9-6-s390x <br> rhel-10-s390x |
| rhel-ppc64le | rhel-8.8-05102023 |
| rhel-sap | rhel-8-4-sap-ha <br> rhel-8-6-sap-ha |
| cos | cos-stable <br> cos-beta <br> cos-dev |
Expand Down
3 changes: 3 additions & 0 deletions ansible/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ virtual_machines:
ssh_key_file: "~/.ssh/acs-s390x-rsa.prv"
families:
- rhel-8-6-s390x
- rhel-9-6-s390x
- rhel-10-s390x
container_engine: podman

# We have taken families name as "p" since there is a character limit for instance name
# in ibm cloud (56 chars max)
Expand Down
3 changes: 2 additions & 1 deletion ansible/roles/create-vm/tasks/create-s390x-vm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
id: "{{ vsi.resource.id | default(omit) }}"
vpc: "{{ s390x.vpc_id }}"
profile: "{{ s390x.vsi_profile }}"
image: "{{ s390x.vsi_image_id }}"
image: "{{ s390x.image_ids[vm_family] }}"
resource_group: "{{ s390x.vsi_resource_group_id }}"
keys:
- "{{ s390x.ssh_key_id }}"
Expand Down Expand Up @@ -99,6 +99,7 @@
- job_id_{{ job_id }}
- platform_{{ test_platform }}
- vm_arch_s390x
- container_engine_{{ container_engine }}
ansible_ssh_extra_args: "-o StrictHostKeyChecking=no"
ansible_ssh_private_key_file: "{{ vm_ssh_key_file }}"
vm_config: "{{ vm_config }}"
Expand Down
6 changes: 4 additions & 2 deletions ansible/vars/s390x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@


s390x:
#rhel-8-6-s390x
vsi_image_id: r014-bd269dc6-aa79-4998-b2bc-1eccbda68ed2
image_ids:
rhel-8-6-s390x: r014-bd269dc6-aa79-4998-b2bc-1eccbda68ed2
rhel-9-6-s390x: r014-f1042c04-7517-46ba-89d7-597c8273a1ba
rhel-10-s390x: r014-18b71370-7941-4ee5-8f07-93d8fb3803ce
vsi_profile: bz2-2x8

# IBM Cloud setup
Expand Down
Loading