Skip to content

Commit 9c58f4d

Browse files
committed
fix(test_extension_ci): increase timeout for valgrind runs
Signed-off-by: Alexandre Rulleau <[email protected]>
1 parent a95b1ff commit 9c58f4d

6 files changed

Lines changed: 9 additions & 4 deletions

.gitlab/generate-common.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ function dockerhub_login() {
143143
ZOOKEEPER_TICK_TIME: 2000
144144
ALLOW_ANONYMOUS_LOGIN: "yes"
145145
ZOOKEEPER_ADMIN_ENABLE_SERVER: "false"
146+
KAFKA_OPTS: "-Dzookeeper.4lw.commands.whitelist=srvr,ruok"
146147

147148
kafka:
148149
name: registry.ddbuild.io/images/mirror/confluentinc/cp-kafka:7.8.0

.gitlab/generate-package.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1168,7 +1168,6 @@
11681168
- job: "prepare code"
11691169
artifacts: true
11701170
before_script:
1171-
<?php dockerhub_login() ?>
11721171
- |
11731172
# Setup cache dirs
11741173
mkdir -p $PIP_CACHE_DIR
@@ -1187,6 +1186,7 @@
11871186

11881187
# Install Python dependencies
11891188
pip install -U pip virtualenv
1189+
<?php dockerhub_login() ?>
11901190
- git clone https://github.com/DataDog/system-tests.git
11911191
- mv packages/{datadog-setup.php,dd-library-php-*x86_64-linux-gnu.tar.gz} system-tests/binaries
11921192
- cd system-tests

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ wait_for_single_service() {
5252
kafka)
5353
# Kafka readiness via nc check + settle time
5454
if timeout 5 nc -z "${HOST}" "${PORT}" 2>/dev/null; then
55-
sleep 5 # Additional settle time for Kafka to fully connect to Zookeeper
55+
sleep 5 # Additional settle time for Kafka
5656
echo "Kafka is ready"
5757
return 0
5858
fi
@@ -72,7 +72,7 @@ wait_for_single_service() {
7272
;;
7373
zookeeper)
7474
# Zookeeper readiness via "ruok" four-letter-word command
75-
if echo "ruok" | nc "${HOST}" "${PORT}" 2>/dev/null | grep -q "imok"; then
75+
if echo "ruok" | nc -w1 -q1 "${HOST}" "${PORT}" 2>/dev/null | grep -q "imok"; then
7676
echo "Zookeeper is ready"
7777
return 0
7878
fi

tests/ext/background-sender/agent_sampling-standalone-asm_01.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@ datadog.trace.agent_test_session_token=background-sender/agent_samplingc
1717
include __DIR__ . '/../includes/request_replayer.inc';
1818

1919
$rr = new RequestReplayer();
20+
$rr->maxIteration = 2000;
2021

2122
$picked = 0;
2223
$notPicked = 0;
23-
for ($i = 0; $i < 5; $i++)
24+
$maxIterations = 10;
25+
for ($i = 0; $i < $maxIterations; $i++)
2426
{
2527
//Do call and get sampling
2628
\DDTrace\start_span();

tests/ext/background-sender/agent_sampling-standalone-asm_02.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ datadog.trace.agent_test_session_token=background-sender/agent_samplingb
1717
include __DIR__ . '/../includes/request_replayer.inc';
1818

1919
$rr = new RequestReplayer();
20+
$rr->maxIteration = 2000;
2021

2122
$get_sampling = function() use ($rr) {
2223
$root = json_decode($rr->waitForDataAndReplay()["body"], true);

tests/ext/background-sender/agent_sampling-standalone-asm_03.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ datadog.trace.agent_test_session_token=background-sender/agent_samplinga
2222
include __DIR__ . '/../includes/request_replayer.inc';
2323

2424
$rr = new RequestReplayer();
25+
$rr->maxIteration = 2000;
2526

2627
$get_sampling = function() use ($rr) {
2728
$root = json_decode($rr->waitForDataAndReplay()["body"], true);

0 commit comments

Comments
 (0)