Skip to content

Commit

Permalink
Use docker on IBM which is needed for building the collector image
Browse files Browse the repository at this point in the history
  • Loading branch information
Molter73 committed Jun 20, 2024
1 parent 5dee38e commit f9e3be4
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 8 deletions.
6 changes: 0 additions & 6 deletions ansible/group_vars/platform_rhcos.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,2 @@
---
ansible_user: core

runtime_command: podman
runtime_as_root: true
runtime_socket: /run/podman/podman.sock

needs_selinux_permissive: true
2 changes: 1 addition & 1 deletion ansible/roles/create-vm/tasks/create-ppc64le-vm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
- job_id_{{ job_id }}
- platform_{{ test_platform }}
- vm_arch_ppc64le
- container_engine_podman
- container_engine_docker
ansible_ssh_extra_args: -o StrictHostKeyChecking=no
ansible_ssh_private_key_file: "{{ vm_ssh_key_file }}"
vm_config: "{{ vm_config }}"
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/create-vm/tasks/create-s390x-vm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
- job_id_{{ job_id }}
- platform_{{ test_platform }}
- vm_arch_s390x
- container_engine_podman
- container_engine_docker
ansible_ssh_extra_args: "-o StrictHostKeyChecking=no"
ansible_ssh_private_key_file: "{{ vm_ssh_key_file }}"
vm_config: "{{ vm_config }}"
Expand Down
23 changes: 23 additions & 0 deletions ansible/roles/provision-vm/tasks/redhat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,28 @@
until: registration is not failed
when: vm_arch == "ppc64le" or vm_arch == "s390x"

- name: Install needed utilities
ansible.builtin.dnf:
name:
- git
- make

- name: Add docker repos
ansible.builtin.shell: |
dnf config-manager --add-repo https://download.docker.com/linux/rhel/docker-ce.repo
when: runtime_command == 'docker'

- name: Install docker
ansible.builtin.dnf:
name:
- docker-ce
- docker-ce-cli
- containerd.io
- docker-buildx-plugin
- docker-compose-plugin
state: present
when: runtime_command == 'docker'

- name: Install podman
ansible.builtin.dnf:
name:
Expand All @@ -34,4 +56,5 @@
- make
state: latest
update_cache: true
when: runtime_command == 'podman'

0 comments on commit f9e3be4

Please sign in to comment.