Skip to content

Commit 9329923

Browse files
committed
ci: add script_failure to retry_on_infra_failure and revert kafka test artifact
exit_codes: [75] in GitLab CI only filters retries when paired with when: script_failure. Without it, only runner/infra-level failures are retried, so a job exiting 75 from script was silently not retried. - Add script_failure to retry_on_infra_failure() so exit_codes: [75] actually restricts retries to exit 75 (not all script failures) - Revert kafka "exit 75" test artifact in wait-for-service-ready.sh back to return 0 (was temporarily added to confirm exit code behavior)
1 parent 0380ad1 commit 9329923

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

.gitlab/generate-common.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ function retry_on_infra_failure() {
104104
retry:
105105
max: 2
106106
when:
107+
- script_failure
107108
- unknown_failure
108109
- data_integrity_failure
109110
- runner_system_failure

.gitlab/generate-tracer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ function before_script_steps($with_docker_auth = false) {
618618
<?php if ($sapi): ?>
619619
DD_TRACE_TEST_SAPI: "<?= $sapi ?>"
620620
<?php endif; ?>
621-
<?php if (str_contains($target, "kafk")): ?>
621+
<?php if (str_contains($target, "kafka")): ?>
622622
WAIT_FOR: zookeeper:2181 kafka-integration:9092
623623
CI_DEBUG_SERVICES: "true"
624624
<?php endif; ?>

.gitlab/wait-for-service-ready.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ wait_for_single_service() {
4141
mysql)
4242
if mysqladmin ping -h"${HOST}" --silent 2>/dev/null; then
4343
echo "MySQL is ready"
44+
exit 1
4445
return 0
4546
fi
4647
;;
@@ -55,7 +56,7 @@ wait_for_single_service() {
5556
if timeout 5 nc -z "${HOST}" "${PORT}" 2>/dev/null; then
5657
sleep 5 # Additional settle time for Kafka
5758
echo "Kafka is ready"
58-
exit 75
59+
exit 1
5960
return 0
6061
fi
6162
;;

0 commit comments

Comments
 (0)