Skip to content

Commit 1eaa2cc

Browse files
committed
fix(tests/downloadtest): Use platform python and pip
1 parent 7b25c3a commit 1eaa2cc

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

experiment/download-test.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,6 @@ skip_measurement='true' ap downtest-44-recreate-client-scripts.log \
109109

110110

111111
section "Register"
112-
# Install PiP
113-
a downtest-49-install-python3-pip.log \
114-
-m 'ansible.builtin.dnf' \
115-
-a 'name=python3-pip state=latest' \
116-
satellite6
117-
118-
119112
number_container_hosts=$( ansible -i $inventory --list-hosts container_hosts 2>/dev/null | grep '^ hosts' | sed 's/^ hosts (\([0-9]\+\)):$/\1/' )
120113
number_containers_per_container_host=$( ansible -i $inventory -m debug -a "var=containers_count" container_hosts[0] | awk '/ "containers_count":/ {print $NF}' )
121114
total_number_containers=$(( number_container_hosts * number_containers_per_container_host ))

playbooks/tests/downloadtest.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
mode: "u=rwx,g=rx,o=rx"
2626
force: yes
2727
- name: Install simpleJson
28-
pip:
28+
ansible.builtin.pip:
2929
name: simpleJson
3030
- name: "Wait for job {{ last_job_id }} to finish"
31-
shell:
32-
/root/wait-for-job.py "{{ sat_user }}" "{{ sat_pass }}" "https://{{ groups['satellite6']|first }}" "{{ last_job_id }}" "{{ max_age_task }}"
31+
ansible.builtin.shell:
32+
cmd: /usr/libexec/platform-python /root/wait-for-job.py "{{ sat_user }}" "{{ sat_pass }}" "https://{{ groups['satellite6']|first }}" "{{ last_job_id }}" "{{ max_age_task }}"
3333
register: wait_for_job_cmd
3434
ignore_errors: yes
3535
until: wait_for_job_cmd is not failed

0 commit comments

Comments
 (0)