revert last 2 commits as other composer command are using root

.gitlab-ci.yml

@@ -109,6 +109,7 @@ default:
   before_script:
     - composer validate
     - composer install --optimize-autoloader
+    - composer run-script drupal-phpunit-upgrade-check
     - 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/
   script:
@@ -444,6 +445,7 @@ default:
   script:
     - composer validate
     - composer install --optimize-autoloader
+    - composer run-script drupal-phpunit-upgrade-check
     - if [ -n "$COMPOSER_UPDATE" ]; then
         composer update --optimize-autoloader;
         composer outdated;

.gitlab-ci/pipeline.yml

@@ -101,6 +101,7 @@ variables:
 
 .run-tests: &run-tests
   script:
+    - sudo -u www-data -E -H composer run-script drupal-phpunit-upgrade-check
     # Need to pass this along directly.
     - sudo -u www-data -E -H php ./core/scripts/run-tests.sh --color --keep-results --types "$TESTSUITE" --concurrency "$CONCURRENCY" --repeat "1" --sqlite "./sites/default/files/tests.sqlite" --dburl $SIMPLETEST_DB --url $SIMPLETEST_BASE_URL --verbose --non-html --all --ci-parallel-node-index $CI_PARALLEL_NODE_INDEX --ci-parallel-node-total $CI_PARALLEL_NODE_TOTAL
 
@@ -230,6 +231,7 @@ variables:
     - <<: *with-database
     - <<: *with-chrome
   script:
+    - sudo -u www-data -E -H composer run-script drupal-phpunit-upgrade-check
     # Run a small subset of tests to prove non W3C testing still works.
     - sudo -u www-data -E -H php ./core/scripts/run-tests.sh --color --keep-results --types "$TESTSUITE" --concurrency "$CONCURRENCY" --repeat "1" --sqlite "./sites/default/files/tests.sqlite" --dburl $SIMPLETEST_DB --url $SIMPLETEST_BASE_URL --verbose --non-html javascript
 

core/scripts/run-tests.sh

@@ -514,8 +514,10 @@ function simpletest_script_init(): void {
 
   // Detect if we're in the top-level process using the private 'execute-test'
   // argument. Determine if being run on drupal.org's testing infrastructure
-  // using the presence of 'GITLAB_CI' environment variable.
-  if (!$args['execute-test'] && getenv('GITLAB_CI') === 'true') {
+  // using the presence of 'drupalci' in the sqlite argument.
+  // @todo https://www.drupal.org/project/drupalci_testbot/issues/2860941 Use
+  //   better environment variable to detect DrupalCI.
+  if (!$args['execute-test'] && preg_match('/drupalci/', $args['sqlite'] ?? '')) {
     // Update PHPUnit if needed and possible. There is a later check once the
     // autoloader is in place to ensure we're on the correct version. We need to
     // do this before the autoloader is in place to ensure that it is correct.