Skip to content

Commit 1af86fe

Browse files
committed
tests: fix installing packages
make sure ansible exits correctly if installation fails
1 parent 0c65204 commit 1af86fe

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

t/scenarios/_common/Makefile.common

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ else
1414
DOCKER_COMPOSE_LOGS=--no-color
1515
endif
1616
export COMPOSE_HTTP_TIMEOUT=180
17+
export COMPOSE_BAKE=true
1718

1819
wait_start:
1920
$(THRUK) cache clean

t/scenarios/_common/ansible/roles/yum_apt_retry/tasks/main.yml

+8
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,16 @@
1212
exit 0
1313
fi
1414
fi
15+
RC=0
1516
if test -f /usr/bin/apt; then
1617
apt-get install -y {{ package | join(' ') }} {{ deb | join(' ') }}
18+
RC=$?
1719
elif test -f /usr/bin/dnf; then
1820
dnf install -y {{ package | join(' ') }} {{ rpm | join(' ') }}
21+
RC=$?
1922
else
2023
yum install -y {{ package | join(' ') }} {{ rpm | join(' ') }}
24+
RC=$?
2125
fi
2226
for file in {{ creates | join(' ') }}; do
2327
if [ $(ls -l1 $(echo $file | tr , ' ') 2>/dev/null | wc -l) -eq 0 ]; then
@@ -27,13 +31,17 @@
2731
exit 1
2832
fi
2933
done
34+
exit $RC
3035
register: install_result
3136
ignore_errors: yes
3237
failed_when: install_result.rc != 0
3338
retries: "{{ retries | default(5) }}"
3439
delay: "{{ delay | default(30) }}"
3540
until: install_result is succeeded
3641

42+
- debug: var=install_result
43+
when: install_result.rc != 0
44+
3745
- name: Verify installation
3846
fail:
3947
msg: package installation failed

0 commit comments

Comments
 (0)