Skip to content

Commit 1c8c591

Browse files
authored
Merge branch 'master' into dubloom/process-tags-di
2 parents c9ff7a7 + c14dafe commit 1c8c591

2 files changed

Lines changed: 12 additions & 0 deletions

File tree

.gitlab/generate-tracer.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,9 @@ function before_script_steps($with_docker_auth = false) {
620620
WAIT_FOR: zookeeper:2181 kafka-integration:9092
621621
CI_DEBUG_SERVICES: "true"
622622
<?php endif; ?>
623+
<?php if (str_contains($target, "sqlsrv")): ?>
624+
WAIT_FOR: sqlsrv-integration:1433
625+
<?php endif; ?>
623626
<?php if (preg_match("(test_web_symfony_(2|30|33|40))", $target)): ?>
624627
COMPOSER_VERSION: 2.2
625628
<?php endif; ?>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ detect_service_type() {
1212
kafka*) echo "kafka" ;;
1313
redis*) echo "redis" ;;
1414
httpbin*) echo "httpbin" ;;
15+
sqlsrv-integration) echo "sqlsrv" ;;
1516
*) echo "generic" ;;
1617
esac
1718
}
@@ -77,6 +78,14 @@ wait_for_single_service() {
7778
return 0
7879
fi
7980
;;
81+
sqlsrv)
82+
# SQL Server readiness check
83+
if timeout 5 bash -c "echo > /dev/tcp/${HOST}/${PORT}" 2>/dev/null; then
84+
echo "SQL Server port ${HOST}:${PORT} is open"
85+
sleep 5
86+
return 0
87+
fi
88+
;;
8089
generic|*)
8190
# For generic services, just verify port + HTTP 200/health endpoint
8291
if curl -sf "http://${HOST}:${PORT}/" > /dev/null 2>&1 || curl -sf "http://${HOST}:${PORT}/health" > /dev/null 2>&1; then

0 commit comments

Comments
 (0)