Skip to content

Commit

Permalink
Fix broken conmon version in CI install (#695)
Browse files Browse the repository at this point in the history
Podman issue:
containers/podman#21024

Conmon issue:
containers/conmon#475

Signed-off-by: Sagi Shnaidman <[email protected]>
  • Loading branch information
sshnaidm authored Dec 23, 2023
1 parent 45893f4 commit 5ee4dd1
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/podman_pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- 'ci/run_containers_tests.sh'
- 'ci/playbooks/containers/podman_pod.yml'
- 'plugins/module_utils/podman/podman_pod_lib.py'
- 'plugins/module_utils/podman/common.py'
- 'plugins/modules/podman_pod.py'
- 'plugins/modules/podman_pod_info.py'
- 'tests/integration/targets/podman_pod/**'
Expand All @@ -20,6 +21,7 @@ on:
- 'ci/run_containers_tests.sh'
- 'ci/playbooks/containers/podman_pod.yml'
- 'plugins/module_utils/podman/podman_pod_lib.py'
- 'plugins/module_utils/podman/common.py'
- 'plugins/modules/podman_pod.py'
- 'plugins/modules/podman_pod_info.py'
- 'tests/integration/targets/podman_pod/**'
Expand Down
16 changes: 16 additions & 0 deletions ci/playbooks/pre.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,22 @@
- ansible_distribution_major_version is version('22', '>=')
- version.stdout is version('1.1.0', '<')

- name: Discover conmon version
shell: conmon --version | grep version | awk {'print $3'}
register: conmon_version
when:
- ansible_distribution == 'Ubuntu'
- ansible_distribution_major_version is version('22', '>=')

- name: Downgrade broken conmon
shell: >-
wget https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_22.04/amd64/conmon_2.1.2~0_amd64.deb -O /tmp/conmon_2.1.2.deb;
apt install -y /tmp/conmon_2.1.2.deb
when:
- ansible_distribution == 'Ubuntu'
- ansible_distribution_major_version is version('22', '>=')
- conmon_version.stdout is version('2.1.9', '==')

- name: Remove virtualenv if need
file:
path: "{{ ansible_venv }}"
Expand Down

0 comments on commit 5ee4dd1

Please sign in to comment.