Skip to content

Commit 4f885cc

Browse files
committed
ci: Don't retry the s390x job
We no longer use the flaky qemu-system runner, so there shouldn't be any need to keep the retry. (backport <#4776>) (cherry picked from commit bad4627)
1 parent 289905a commit 4f885cc

File tree

1 file changed

+6
-36
lines changed

1 file changed

+6
-36
lines changed

ci/run.sh

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -25,39 +25,9 @@ case "$target" in
2525
*) cmd="$cmd --workspace" ;;
2626
esac
2727

28-
if [ "$target" = "s390x-unknown-linux-gnu" ]; then
29-
# FIXME: s390x-unknown-linux-gnu often fails to test due to timeout,
30-
# so we retry this N times.
31-
N=5
32-
n=0
33-
passed=0
34-
until [ $n -ge $N ]; do
35-
if [ "$passed" = "0" ]; then
36-
# shellcheck disable=SC2086
37-
if $cmd --no-default-features -- $test_flags; then
38-
passed=$((passed + 1))
39-
continue
40-
fi
41-
elif [ "$passed" = "1" ]; then
42-
# shellcheck disable=SC2086
43-
if $cmd -- $test_flags; then
44-
passed=$((passed + 1))
45-
continue
46-
fi
47-
elif [ "$passed" = "2" ]; then
48-
# shellcheck disable=SC2086
49-
if $cmd --features extra_traits -- $test_flags; then
50-
break
51-
fi
52-
fi
53-
n=$((n + 1))
54-
sleep 1
55-
done
56-
else
57-
# shellcheck disable=SC2086
58-
$cmd --no-default-features -- $test_flags
59-
# shellcheck disable=SC2086
60-
$cmd -- $test_flags
61-
# shellcheck disable=SC2086
62-
$cmd --features extra_traits -- $test_flags
63-
fi
28+
# shellcheck disable=SC2086
29+
$cmd --no-default-features -- $test_flags
30+
# shellcheck disable=SC2086
31+
$cmd -- $test_flags
32+
# shellcheck disable=SC2086
33+
$cmd --features extra_traits -- $test_flags

0 commit comments

Comments
 (0)