Issue #3415296 by catch, sudhakartag1, smustgrave: Use a dedicated runner for performance tests

merge-requests/6266/head^2
Dave Long 2024-02-02 14:22:05 +00:00
parent 451be835c0
commit b35de78f74
No known key found for this signature in database
GPG Key ID: ED52AE211E142771
3 changed files with 10 additions and 7 deletions

View File

@ -83,6 +83,7 @@ variables:
- "--no-sandbox"
- "--log-path=/builds/chromedriver.log"
- "--whitelisted-ips="
- "--allowed-origins=*"
.run-tests: &run-tests
script:
@ -221,6 +222,9 @@ variables:
- if: $PERFORMANCE_TEST == "1"
variables:
KUBERNETES_CPU_REQUEST: "24"
MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","chromeOptions":{"args":["--disable-dev-shm-usage","--disable-gpu","--headless","--no-sandbox"]}}, "http://chrome:9515"]'
tags:
- performance-test-runner
services:
- <<: *with-database
- <<: *with-chrome
@ -235,4 +239,4 @@ variables:
- mkdir -p ./sites/simpletest ./sites/default/files ./build/logs/junit /var/www/.composer
- chown -R www-data:www-data ./sites ./build/logs/junit ./vendor /var/www/
- sudo -u www-data git config --global --add safe.directory $CI_PROJECT_DIR
- for run in {1..3}; do sudo SIMPLETEST_BASE_URL="$SIMPLETEST_BASE_URL" SIMPLETEST_DB="$SIMPLETEST_DB" MINK_DRIVER_ARGS_WEBDRIVER="$MINK_DRIVER_ARGS_WEBDRIVER" OTEL_COLLECTOR="$OTEL_COLLECTOR" -u www-data ./vendor/bin/phpunit -c core --group OpenTelemetry --log-junit=./sites/default/files/simpletest/phpunit-performance.xml; done
- for run in {1..3}; do sudo SIMPLETEST_BASE_URL="http://$HOSTNAME/subdirectory" SIMPLETEST_DB="$SIMPLETEST_DB" MINK_DRIVER_ARGS_WEBDRIVER="$MINK_DRIVER_ARGS_WEBDRIVER" OTEL_COLLECTOR="$OTEL_COLLECTOR" -u www-data ./vendor/bin/phpunit --verbose -c core --group OpenTelemetry --log-junit=./sites/default/files/simpletest/phpunit-performance.xml; done

View File

@ -2970,11 +2970,6 @@ parameters:
count: 1
path: tests/Drupal/BuildTests/Framework/Tests/ExternalCommandRequirementTest.php
-
message: "#^Variable \\$rawResult on left side of \\?\\? always exists and is not nullable\\.$#"
count: 1
path: tests/Drupal/FunctionalJavascriptTests/WebDriverCurlService.php
-
message: "#^Variable \\$found might not be defined\\.$#"
count: 1

View File

@ -117,7 +117,11 @@ class WebDriverCurlService extends CurlService {
curl_setopt($curl, CURLOPT_HTTPHEADER, $customHeaders);
$rawResult = trim(curl_exec($curl));
$result = curl_exec($curl);
$rawResult = NULL;
if ($result !== FALSE) {
$rawResult = trim($result);
}
$info = curl_getinfo($curl);
$info['request_method'] = $requestMethod;