Skip to content

Commit 2df1f16

Browse files
PROFeNoMbwoebi
PROFeNoM
and
bwoebi
authored
Reduce CI and Local Flakiness (#2496)
* perf: Increase randomized_tests' resource_class to xlarge * test: Identify and use master nodes * test: Remove flaky endpoint * perf: Increase test_extension_ci resource_class * fix: Unused container in `integration` * perf: Use parallel works for `php_language_tests-8.3` * fix: `with_executor` type * fix: Run `STEP_WAIT_MYSQL` if `with_integrations` is used * fix: Duplicate runs of `test_extension_ci` * perf: Reduce randomized tests concurrency * fix: Use of the profiler in PHP 7.0 during randomized tests * perf: Increase `fuzz_appsec_helper` resource class * debug(randomized tests): Save docker container logs * debug(randomized tests): Split docker logs by scenario * fix(randomized tests): Don't try to analyze docker logs * fix(debug): Add SCENARIO to shutdown script * feat: Add `DD_TRACE_AGENT_RETRIES` * fix: Memory Leak on `read_data` * fix: Memory Leak on `read_data` * perf: Change nginx config files to handle more requests * fix: Prevent race condition during docker shutdown * style: Reduce amount of Guzzle snapshot changes * fix: Add intermediate sleep to prevent race conditions * refactor: Randomized tests sequence * refactor: Remove docker logs * fix: Remove SHELLFLAGS * cost: Reduce duration of randomized tests * refactor: Dead code * docs: Mention `CONTRIBUTING.md` in Snapshot diff * fix: Add missing dd.measured * fix: Memory issue * tests: Set `DD_TRACE_LOG_FILE` to `/results/dd_php_error.log` * tests: Set `datadog.trace.log_file` to `/results/dd_php_error.log` * debug: Run with RUST_BACKTRACE enabled * tests: Set `DD_TRACE_LOG_FILE` to `/results/dd_php_error.log` in php-fpm conf template * feat: Add retries to web/integrations tests composer update * fix: Add try/catch/finally around mysqliVariant1 * fix: Verify that socket is accessible, else create it * tests: Set `datadog.trace.log_file` ini to php-fpm * debug: Show the composer command * fix: whitespace Makefile typo * perf(vegeta): Use two CPUs instead of one * debug: Enable RUST_DEBUG_SYMBOLS * feat: Add retries when fetching from remote repository * [temporary] debug: Update libdatadog branch to `alex/debug/set_hook_panic` * [temporary] debug: Increase context deadline timeout to 45mn * Fix fetching __cxa_thread_atexit_impl and handling multiple dtor calls Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com> * fix: Compilation issue * fix: Use POSIX-compliant syntax * bench(Redis): Don't use I/O commands (See Notes) Notes: I think not doing commands doing I/O should prevent, or at the very least reduce, any variability that could be associated with disks R/W. What's more, we're not using AOF, so a bgRewriteAOF doesn't make sense. We fundamentally don't care about the commands executed, only the overhead associated with traceMethodNoArgs and traceMethodAsCommand * Fix sidecar crashes in nts builds Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com> * Revert "debug: Enable RUST_DEBUG_SYMBOLS" This reverts commit 53d5e95. * Revert "[temporary] debug: Update libdatadog branch to `alex/debug/set_hook_panic`" This reverts commit e232021. * Revert "[temporary] debug: Increase context deadline timeout to 45mn" This reverts commit da61eea. * style: Update Snapshot comment instead of adding it * fix: Wrong Parameters * refactor: Remove dead code * refactor: Only increase fascgi_buffers size * tests: Do 100 requests per seconds --------- Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com> Co-authored-by: Bob Weinand <bob.weinand@datadoghq.com>
1 parent d8a8624 commit 2df1f16

31 files changed

Lines changed: 387 additions & 425 deletions

‎.circleci/continue_config.yml‎

Lines changed: 64 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,15 @@ aliases:
257257
git remote set-url origin "$CIRCLE_REPOSITORY_URL" || true
258258
259259
echo 'Fetching from remote repository'
260+
retry_count=3
260261
if [ -n "$CIRCLE_TAG" ]; then
261-
git fetch --force --no-recurse-submodules --tags origin
262+
for i in $(seq 1 $retry_count); do
263+
git fetch --force --no-recurse-submodules --tags origin && break || sleep 1
264+
done
262265
elif [ -z "$CIRCLE_PR_NUMBER" ]; then
263-
git fetch --force --no-recurse-submodules origin "+refs/heads/$CIRCLE_BRANCH:refs/remotes/origin/$CIRCLE_BRANCH"
266+
for i in $(seq 1 $retry_count); do
267+
git fetch --force --no-recurse-submodules origin "+refs/heads/$CIRCLE_BRANCH:refs/remotes/origin/$CIRCLE_BRANCH" && break || sleep 1
268+
done
264269
fi
265270
else
266271
echo 'Cloning git repository'
@@ -605,6 +610,20 @@ executors:
605610
- <<: *IMAGE_DOCKER_REQUEST_REPLAYER
606611
- <<: *IMAGE_DOCKER_DD_TEST_AGENT
607612
- <<: *IMAGE_DOCKER_SQLSRV
613+
with_redis:
614+
environment:
615+
DDAGENT_HOSTNAME: 127.0.0.1
616+
COMPOSER_MEMORY_LIMIT: -1 # disable composer memory limit completely
617+
parameters:
618+
docker_image:
619+
type: string
620+
docker:
621+
- image: << parameters.docker_image >>
622+
- <<: *IMAGE_DOCKER_HTTPBIN
623+
- <<: *IMAGE_DOCKER_REDIS
624+
- <<: *IMAGE_DOCKER_REQUEST_REPLAYER
625+
- <<: *IMAGE_DOCKER_DD_TEST_AGENT
626+
608627

609628
jobs:
610629
"Lint PHP 5":
@@ -1501,9 +1520,12 @@ jobs:
15011520
coverage:
15021521
type: boolean
15031522
default: false
1523+
with_executor:
1524+
type: string
1525+
default: 'with_integrations'
15041526
resource_class: << parameters.resource_class >>
15051527
executor:
1506-
name: with_integrations
1528+
name: << parameters.with_executor >>
15071529
docker_image: datadog/dd-trace-ci:php-<< parameters.php_major_minor >>_buster
15081530
environment:
15091531
COMPOSER_PROCESS_TIMEOUT: 0
@@ -1534,7 +1556,11 @@ jobs:
15341556
- <<: *STEP_PREPARE_TEST_RESULTS_DIR
15351557
- <<: *STEP_EXPORT_CI_ENV
15361558
- <<: *STEP_DISABLE_XDEBUG
1537-
- <<: *STEP_WAIT_MYSQL
1559+
- when:
1560+
condition:
1561+
equal: [ "with_integrations", << parameters.with_executor >> ]
1562+
steps:
1563+
- <<: *STEP_WAIT_MYSQL
15381564
- <<: *STEP_WAIT_REQUEST_REPLAYER
15391565
- <<: *STEP_WAIT_TEST_AGENT
15401566
- run:
@@ -2084,7 +2110,7 @@ jobs:
20842110
working_directory: ~/datadog
20852111
machine:
20862112
image: ubuntu-2004:2023.04.2
2087-
resource_class: large
2113+
resource_class: xlarge
20882114
environment:
20892115
- RANDOMIZED_RESTRICT_PLATFORMS: centos7
20902116
parameters:
@@ -2117,10 +2143,10 @@ jobs:
21172143
command: make -C tests/randomized library.local
21182144
- run:
21192145
name: Generate scenarios
2120-
command: make -C tests/randomized generate PLATFORMS=$RANDOMIZED_RESTRICT_PLATFORMS
2146+
command: make -C tests/randomized generate PLATFORMS=$RANDOMIZED_RESTRICT_PLATFORMS NUMBER_OF_SCENARIOS=4
21212147
- run:
21222148
name: Execute tests
2123-
command: make -C tests/randomized test CONCURRENT_JOBS=5 DURATION=1m30s
2149+
command: make -C tests/randomized test CONCURRENT_JOBS=2 DURATION=1m30s
21242150
- run:
21252151
name: Fix PHP-FPM logs permissions before storing artifacts
21262152
command: sudo chown -R circleci:circleci tests/randomized/.tmp.scenarios/.results
@@ -4192,14 +4218,40 @@ workflows:
41924218
- "8.3"
41934219
make_target:
41944220
- test_coverage
4195-
- test_extension_ci
41964221
- test_unit
41974222
- test_api_unit
41984223
- test_c2php
41994224
- test_c_disabled
42004225
- test_internal_api_randomized
42014226
- test_opcache
42024227

4228+
- test:
4229+
requires: [ 'Prepare Code' ]
4230+
matrix:
4231+
parameters:
4232+
php_major_minor:
4233+
- "7.0"
4234+
- "7.1"
4235+
- "7.2"
4236+
- "7.3"
4237+
make_target:
4238+
- test_extension_ci
4239+
4240+
- test:
4241+
requires: [ 'Prepare Code' ]
4242+
matrix:
4243+
parameters:
4244+
resource_class:
4245+
- medium+
4246+
php_major_minor:
4247+
- "7.4"
4248+
- "8.0"
4249+
- "8.1"
4250+
- "8.2"
4251+
- "8.3"
4252+
make_target:
4253+
- test_extension_ci
4254+
42034255
# sidecar is version independent
42044256
- test_sidecar_sender:
42054257
requires: [ 'Prepare Code' ]
@@ -4333,6 +4385,7 @@ workflows:
43334385
resource_class: medium+
43344386
sapi: fpm-fcgi
43354387
disable_runner_distributed_tracing: true
4388+
with_executor: 'with_httpbin_and_request_replayer'
43364389
matrix:
43374390
parameters:
43384391
php_major_minor:
@@ -4351,6 +4404,7 @@ workflows:
43514404
# Once the fix for https://github.com/phpredis/phpredis/issues/1869 is released, we can remove this additional
43524405
# runner and add back again test_integrations_phpredis5 to the PHP 8.0 test suite.
43534406
requires: [ 'Prepare Code' ]
4407+
with_executor: 'with_redis'
43544408
matrix:
43554409
parameters:
43564410
php_major_minor:
@@ -4369,6 +4423,7 @@ workflows:
43694423
sapi: fpm-fcgi
43704424
disable_runner_distributed_tracing: true
43714425
coverage: true
4426+
with_executor: 'with_httpbin_and_request_replayer'
43724427
matrix:
43734428
parameters:
43744429
php_major_minor:
@@ -4443,6 +4498,7 @@ workflows:
44434498
name: "PHP 83 language tests"
44444499
xfail_list: dockerfiles/ci/xfail_tests/8.3.list
44454500
docker_image: "datadog/dd-trace-ci:php-8.3_buster"
4501+
parallel_workers: true
44464502
- php_language_tests:
44474503
requires: [ 'Language tests' ]
44484504
name: "PHP 82 language tests"

‎Makefile‎

Lines changed: 52 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -941,6 +941,14 @@ TEST_WEB_83 := \
941941
test_web_zend_1_21
942942

943943
FILTER := .
944+
MAX_RETRIES := 3
945+
946+
define run_composer_with_retry
947+
for i in $$(seq 1 $(MAX_RETRIES)); do \
948+
echo "Attempting composer update (attempt $$i of $(MAX_RETRIES))..."; \
949+
$(COMPOSER) --working-dir=$1 update $2 && break || (echo "Retry $$i failed, waiting 5 seconds before next attempt..." && sleep 5); \
950+
done
951+
endef
944952

945953
define run_tests_without_coverage
946954
$(TEST_EXTRA_ENV) $(ENV_OVERRIDE) php $(TEST_EXTRA_INI) $(REQUEST_INIT_HOOK) $(PHPUNIT) $(1) --filter=$(FILTER)
@@ -1041,9 +1049,9 @@ test_metrics: global_test_run_dependencies
10411049
$(call run_tests,--testsuite=metrics $(TESTS))
10421050

10431051
benchmarks_run_dependencies: global_test_run_dependencies
1044-
$(COMPOSER) --working-dir=tests/Frameworks/Symfony/Version_5_2 update
1052+
$(call run_composer_with_retry,tests/Frameworks/Symfony/Version_5_2,)
10451053
php tests/Frameworks/Symfony/Version_5_2/bin/console cache:clear --no-warmup --env=prod
1046-
$(COMPOSER) --working-dir=tests/Frameworks/Laravel/Version_8_x update
1054+
$(call run_composer_with_retry,tests/Frameworks/Laravel/Version_8_x,)
10471055
rm -f tests/.scenarios.lock/benchmarks/composer.lock
10481056
$(MAKE) test_scenario_benchmarks
10491057

@@ -1154,96 +1162,96 @@ test_integrations_predis1: global_test_run_dependencies
11541162
$(MAKE) test_scenario_predis1
11551163
$(call run_tests_debug,tests/Integrations/Predis)
11561164
test_integrations_roadrunner: global_test_run_dependencies
1157-
$(COMPOSER) --working-dir=tests/Frameworks/Roadrunner/Version_2 update
1165+
$(call run_composer_with_retry,tests/Frameworks/Roadrunner/Version_2,)
11581166
$(call run_tests_debug,tests/Integrations/Roadrunner/V2)
11591167
test_integrations_sqlsrv: global_test_run_dependencies
11601168
$(MAKE) test_scenario_default
11611169
$(call run_tests_debug,tests/Integrations/SQLSRV)
11621170
test_web_cakephp_28: global_test_run_dependencies
1163-
$(COMPOSER) --working-dir=tests/Frameworks/CakePHP/Version_2_8 update
1171+
$(call run_composer_with_retry,tests/Frameworks/CakePHP/Version_2_8,)
11641172
$(call run_tests_debug,--testsuite=cakephp-28-test)
11651173
test_web_codeigniter_22: global_test_run_dependencies
11661174
$(call run_tests_debug,--testsuite=codeigniter-22-test)
11671175
test_web_drupal_89: global_test_run_dependencies
1168-
$(COMPOSER) --working-dir=tests/Frameworks/Drupal/Version_8_9/core update --ignore-platform-reqs
1169-
$(COMPOSER) --working-dir=tests/Frameworks/Drupal/Version_8_9 update --ignore-platform-reqs
1176+
$(call run_composer_with_retry,tests/Frameworks/Drupal/Version_8_9/core,--ignore-platform-reqs)
1177+
$(call run_composer_with_retry,tests/Frameworks/Drupal/Version_8_9,--ignore-platform-reqs)
11701178
$(call run_tests_debug,tests/Integrations/Drupal/V8_9)
11711179
test_web_drupal_95: global_test_run_dependencies
1172-
$(COMPOSER) --working-dir=tests/Frameworks/Drupal/Version_9_5/core update --ignore-platform-reqs
1173-
$(COMPOSER) --working-dir=tests/Frameworks/Drupal/Version_9_5 update --ignore-platform-reqs
1180+
$(call run_composer_with_retry,tests/Frameworks/Drupal/Version_9_5/core,--ignore-platform-reqs)
1181+
$(call run_composer_with_retry,tests/Frameworks/Drupal/Version_9_5,--ignore-platform-reqs)
11741182
$(call run_tests_debug,tests/Integrations/Drupal/V9_5)
11751183
test_web_drupal_101: global_test_run_dependencies
1176-
$(COMPOSER) --working-dir=tests/Frameworks/Drupal/Version_10_1/core update --ignore-platform-reqs
1177-
$(COMPOSER) --working-dir=tests/Frameworks/Drupal/Version_10_1 update --ignore-platform-reqs
1184+
$(call run_composer_with_retry,tests/Frameworks/Drupal/Version_10_1/core,--ignore-platform-reqs)
1185+
$(call run_composer_with_retry,tests/Frameworks/Drupal/Version_10_1,--ignore-platform-reqs)
11781186
$(call run_tests_debug,tests/Integrations/Drupal/V10_1)
11791187
test_web_laminas_rest_19: global_test_run_dependencies
1180-
$(COMPOSER) --working-dir=tests/Frameworks/Laminas/ApiTools/Version_1_9 update
1188+
$(call run_composer_with_retry,tests/Frameworks/Laminas/ApiTools/Version_1_9,)
11811189
$(call run_tests_debug,tests/Integrations/Laminas/ApiTools/V1_9)
11821190
test_web_laminas_14: global_test_run_dependencies
1183-
$(COMPOSER) --working-dir=tests/Frameworks/Laminas/Version_1_4 update
1191+
$(call run_composer_with_retry,tests/Frameworks/Laminas/Version_1_4,)
11841192
$(call run_tests_debug,tests/Integrations/Laminas/V1_4)
11851193
test_web_laminas_20: global_test_run_dependencies
1186-
$(COMPOSER) --working-dir=tests/Frameworks/Laminas/Version_2_0 update
1194+
$(call run_composer_with_retry,tests/Frameworks/Laminas/Version_2_0,)
11871195
$(call run_tests_debug,tests/Integrations/Laminas/V2_0)
11881196
test_web_laravel_42: global_test_run_dependencies
1189-
$(COMPOSER) --working-dir=tests/Frameworks/Laravel/Version_4_2 update
1197+
$(call run_composer_with_retry,tests/Frameworks/Laravel/Version_4_2,)
11901198
php tests/Frameworks/Laravel/Version_4_2/artisan optimize
11911199
$(call run_tests_debug,tests/Integrations/Laravel/V4)
11921200
test_web_laravel_57: global_test_run_dependencies
1193-
$(COMPOSER) --working-dir=tests/Frameworks/Laravel/Version_5_7 update
1201+
$(call run_composer_with_retry,tests/Frameworks/Laravel/Version_5_7,)
11941202
$(call run_tests_debug,tests/Integrations/Laravel/V5_7)
11951203
test_web_laravel_58: global_test_run_dependencies
1196-
$(COMPOSER) --working-dir=tests/Frameworks/Laravel/Version_5_8 update
1204+
$(call run_composer_with_retry,tests/Frameworks/Laravel/Version_5_8,)
11971205
$(call run_tests_debug,--testsuite=laravel-58-test)
11981206
test_web_laravel_8x: global_test_run_dependencies
1199-
$(COMPOSER) --working-dir=tests/Frameworks/Laravel/Version_8_x update
1207+
$(call run_composer_with_retry,tests/Frameworks/Laravel/Version_8_x,)
12001208
$(call run_tests_debug,--testsuite=laravel-8x-test)
12011209
test_web_laravel_9x: global_test_run_dependencies
1202-
$(COMPOSER) --working-dir=tests/Frameworks/Laravel/Version_9_x update
1210+
$(call run_composer_with_retry,tests/Frameworks/Laravel/Version_9_x,)
12031211
$(call run_tests_debug,--testsuite=laravel-9x-test)
12041212
test_web_laravel_10x: global_test_run_dependencies
1205-
$(COMPOSER) --working-dir=tests/Frameworks/Laravel/Version_10_x update
1213+
$(call run_composer_with_retry,tests/Frameworks/Laravel/Version_10_x,)
12061214
$(call run_tests_debug,--testsuite=laravel-10x-test)
12071215
test_web_lumen_52: global_test_run_dependencies
1208-
$(COMPOSER) --working-dir=tests/Frameworks/Lumen/Version_5_2 update
1216+
$(call run_composer_with_retry,tests/Frameworks/Lumen/Version_5_2,)
12091217
$(call run_tests_debug,tests/Integrations/Lumen/V5_2)
12101218
test_web_lumen_56: global_test_run_dependencies
1211-
$(COMPOSER) --working-dir=tests/Frameworks/Lumen/Version_5_6 update
1219+
$(call run_composer_with_retry,tests/Frameworks/Lumen/Version_5_6,)
12121220
$(call run_tests_debug,tests/Integrations/Lumen/V5_6)
12131221
test_web_lumen_58: global_test_run_dependencies
1214-
$(COMPOSER) --working-dir=tests/Frameworks/Lumen/Version_5_8 update
1222+
$(call run_composer_with_retry,tests/Frameworks/Lumen/Version_5_8,)
12151223
$(call run_tests_debug,tests/Integrations/Lumen/V5_8)
12161224
test_web_lumen_81: global_test_run_dependencies
1217-
$(COMPOSER) --working-dir=tests/Frameworks/Lumen/Version_8_1 update
1225+
$(call run_composer_with_retry,tests/Frameworks/Lumen/Version_8_1,)
12181226
$(call run_tests_debug,tests/Integrations/Lumen/V8_1)
12191227
test_web_lumen_90: global_test_run_dependencies
1220-
$(COMPOSER) --working-dir=tests/Frameworks/Lumen/Version_9_0 update
1228+
$(call run_composer_with_retry,tests/Frameworks/Lumen/Version_9_0,)
12211229
$(call run_tests_debug,tests/Integrations/Lumen/V9_0)
12221230
test_web_lumen_100: global_test_run_dependencies
1223-
$(COMPOSER) --working-dir=tests/Frameworks/Lumen/Version_10_0 update
1231+
$(call run_composer_with_retry,tests/Frameworks/Lumen/Version_10_0,)
12241232
$(call run_tests_debug,tests/Integrations/Lumen/V10_0)
12251233
test_web_slim_312: global_test_run_dependencies
1226-
$(COMPOSER) --working-dir=tests/Frameworks/Slim/Version_3_12 update
1234+
$(call run_composer_with_retry,tests/Frameworks/Slim/Version_3_12,)
12271235
$(call run_tests_debug,--testsuite=slim-312-test)
12281236
test_web_slim_4: global_test_run_dependencies
1229-
$(COMPOSER) --working-dir=tests/Frameworks/Slim/Version_4 update
1237+
$(call run_composer_with_retry,tests/Frameworks/Slim/Version_4,)
12301238
$(call run_tests_debug,--testsuite=slim-4-test)
12311239
test_web_symfony_23: global_test_run_dependencies
1232-
$(COMPOSER) --working-dir=tests/Frameworks/Symfony/Version_2_3 update
1240+
$(call run_composer_with_retry,tests/Frameworks/Symfony/Version_2_3,)
12331241
$(call run_tests_debug,tests/Integrations/Symfony/V2_3)
12341242
test_web_symfony_28: global_test_run_dependencies
1235-
$(COMPOSER) --working-dir=tests/Frameworks/Symfony/Version_2_8 update
1243+
$(call run_composer_with_retry,tests/Frameworks/Symfony/Version_2_8,)
12361244
$(call run_tests_debug,tests/Integrations/Symfony/V2_8)
12371245
test_web_symfony_30: global_test_run_dependencies
1238-
$(COMPOSER) --working-dir=tests/Frameworks/Symfony/Version_3_0 update
1246+
$(call run_composer_with_retry,tests/Frameworks/Symfony/Version_3_0,)
12391247
php tests/Frameworks/Symfony/Version_3_0/bin/console cache:clear --no-warmup --env=prod
12401248
$(call run_tests_debug,tests/Integrations/Symfony/V3_0)
12411249
test_web_symfony_33: global_test_run_dependencies
1242-
$(COMPOSER) --working-dir=tests/Frameworks/Symfony/Version_3_3 update
1250+
$(call run_composer_with_retry,tests/Frameworks/Symfony/Version_3_3,)
12431251
php tests/Frameworks/Symfony/Version_3_3/bin/console cache:clear --no-warmup --env=prod
12441252
$(call run_tests_debug,tests/Integrations/Symfony/V3_3)
12451253
test_web_symfony_34: global_test_run_dependencies
1246-
$(COMPOSER) --working-dir=tests/Frameworks/Symfony/Version_3_4 update
1254+
$(call run_composer_with_retry,tests/Frameworks/Symfony/Version_3_4,)
12471255
php tests/Frameworks/Symfony/Version_3_4/bin/console cache:clear --no-warmup --env=prod
12481256
$(call run_tests_debug,tests/Integrations/Symfony/V3_4)
12491257
test_web_symfony_40: global_test_run_dependencies
@@ -1253,34 +1261,33 @@ test_web_symfony_40: global_test_run_dependencies
12531261
php tests/Frameworks/Symfony/Version_4_0/bin/console cache:clear --no-warmup --env=prod
12541262
$(call run_tests_debug,tests/Integrations/Symfony/V4_0)
12551263
test_web_symfony_42: global_test_run_dependencies
1256-
$(COMPOSER) --working-dir=tests/Frameworks/Symfony/Version_4_2 update
1264+
$(call run_composer_with_retry,tests/Frameworks/Symfony/Version_4_2,)
12571265
php tests/Frameworks/Symfony/Version_4_2/bin/console cache:clear --no-warmup --env=prod
12581266
$(call run_tests_debug,tests/Integrations/Symfony/V4_2)
12591267
test_web_symfony_44: global_test_run_dependencies
1260-
$(COMPOSER) --working-dir=tests/Frameworks/Symfony/Version_4_4 update
1268+
$(call run_composer_with_retry,tests/Frameworks/Symfony/Version_4_4,)
12611269
php tests/Frameworks/Symfony/Version_4_4/bin/console cache:clear --no-warmup --env=prod
12621270
$(call run_tests_debug,--testsuite=symfony-44-test)
12631271
test_web_symfony_50: global_test_run_dependencies
12641272
$(COMPOSER) --working-dir=tests/Frameworks/Symfony/Version_5_0 install # EOL; install from lock
12651273
php tests/Frameworks/Symfony/Version_5_0/bin/console cache:clear --no-warmup --env=prod
12661274
$(call run_tests_debug,tests/Integrations/Symfony/V5_0)
12671275
test_web_symfony_51: global_test_run_dependencies
1268-
$(COMPOSER) --working-dir=tests/Frameworks/Symfony/Version_5_1 update
1276+
$(call run_composer_with_retry,tests/Frameworks/Symfony/Version_5_1,)
12691277
php tests/Frameworks/Symfony/Version_5_1/bin/console cache:clear --no-warmup --env=prod
12701278
$(call run_tests_debug,tests/Integrations/Symfony/V5_1)
12711279
test_web_symfony_52: global_test_run_dependencies
1272-
$(COMPOSER) --working-dir=tests/Frameworks/Symfony/Version_5_2 update
1280+
$(call run_composer_with_retry,tests/Frameworks/Symfony/Version_5_2,)
12731281
php tests/Frameworks/Symfony/Version_5_2/bin/console cache:clear --no-warmup --env=prod
12741282
$(call run_tests_debug,--testsuite=symfony-52-test)
12751283
test_web_symfony_62: global_test_run_dependencies
1276-
$(COMPOSER) --working-dir=tests/Frameworks/Symfony/Version_6_2 update
1284+
$(call run_composer_with_retry,tests/Frameworks/Symfony/Version_6_2,)
12771285
php tests/Frameworks/Symfony/Version_6_2/bin/console cache:clear --no-warmup --env=prod
12781286
$(call run_tests_debug,--testsuite=symfony-62-test)
12791287
test_web_symfony_70: global_test_run_dependencies
1280-
$(COMPOSER) --working-dir=tests/Frameworks/Symfony/Version_7_0 update
1288+
$(call run_composer_with_retry,tests/Frameworks/Symfony/Version_7_0,)
12811289
php tests/Frameworks/Symfony/Version_7_0/bin/console cache:clear --no-warmup --env=prod
12821290
$(call run_tests_debug,--testsuite=symfony-70-test)
1283-
12841291
test_web_wordpress_48: global_test_run_dependencies
12851292
$(call run_tests_debug,tests/Integrations/WordPress/V4_8)
12861293
test_web_wordpress_55: global_test_run_dependencies
@@ -1290,26 +1297,26 @@ test_web_wordpress_59: global_test_run_dependencies
12901297
test_web_wordpress_61: global_test_run_dependencies
12911298
$(call run_tests_debug,tests/Integrations/WordPress/V6_1)
12921299
test_web_yii_2: global_test_run_dependencies
1293-
$(COMPOSER) --working-dir=tests/Frameworks/Yii/Version_2_0 update
1300+
$(call run_composer_with_retry,tests/Frameworks/Yii/Version_2_0,)
12941301
$(call run_tests_debug,tests/Integrations/Yii/V2_0)
12951302
test_web_magento_23: global_test_run_dependencies
1296-
$(COMPOSER) --working-dir=tests/Frameworks/Magento/Version_2_3 update
1303+
$(call run_composer_with_retry,tests/Frameworks/Magento/Version_2_3,)
12971304
$(call run_tests_debug,tests/Integrations/Magento/V2_3)
12981305
test_web_magento_24: global_test_run_dependencies
1299-
$(COMPOSER) --working-dir=tests/Frameworks/Magento/Version_2_4 update
1306+
$(call run_composer_with_retry,tests/Frameworks/Magento/Version_2_4,)
13001307
$(call run_tests_debug,tests/Integrations/Magento/V2_4)
13011308
test_web_nette_24: global_test_run_dependencies
1302-
$(COMPOSER) --working-dir=tests/Frameworks/Nette/Version_2_4 update
1309+
$(call run_composer_with_retry,tests/Frameworks/Nette/Version_2_4,)
13031310
$(call run_tests_debug,tests/Integrations/Nette/V2_4)
13041311
test_web_nette_30: global_test_run_dependencies
1305-
$(COMPOSER) --working-dir=tests/Frameworks/Nette/Version_3_0 update
1312+
$(call run_composer_with_retry,tests/Frameworks/Nette/Version_3_0,)
13061313
$(call run_tests_debug,tests/Integrations/Nette/V3_0)
13071314
test_web_zend_1: global_test_run_dependencies
13081315
$(call run_tests_debug,tests/Integrations/ZendFramework/V1)
13091316
test_web_zend_1_21: global_test_run_dependencies
13101317
$(call run_tests_debug,tests/Integrations/ZendFramework/V1_21)
13111318
test_web_custom: global_test_run_dependencies
1312-
$(COMPOSER) --working-dir=tests/Frameworks/Custom/Version_Autoloaded update
1319+
$(call run_composer_with_retry,tests/Frameworks/Custom/Version_Autoloaded,)
13131320
$(call run_tests_debug,--testsuite=custom-framework-autoloading-test)
13141321

13151322
test_scenario_%:

0 commit comments

Comments
 (0)