[TASK] Avoid reports.xml in acceptance tests

Creating reports.xml in acceptance tests and feeding this to gitlab has been added with issue #96628 in the hope to be useful for finding frequently failing ac tests. The gitlab UI however buries this, it's de facto impossible to make use of this information. We drop this definition again. Resolves: #101514 Related: #96628 Releases: main, 12.4, 11.5 Change-Id: I91f13f402f0b9f72f2ca41252db93bb1714efcd6 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/80287 Tested-by: core-ci <typo3@b13.com> Reviewed-by: Stefan B�rk <stefan@buerk.tech> Tested-by: Christian Kuhn <lolli@schwarzbu.ch> Tested-by: Stefan B�rk <stefan@buerk.tech> Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
TYPO3 · Jul 31, 2023 · c9433a5 · c9433a5
1 parent 54c6793
commit c9433a5
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 63 deletions.
diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh
@@ -500,9 +500,9 @@ case ${TEST_SUITE} in
         handleDbmsAndDriverOptions
         if [ "${CHUNKS}" -gt 0 ]; then
             ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name ac-splitter-${SUFFIX} ${IMAGE_PHP} php -dxdebug.mode=off Build/Scripts/splitAcceptanceTests.php -v ${CHUNKS}
-            COMMAND="bin/codecept run Application -d -g AcceptanceTests-Job-${THISCHUNK} -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} ${TEST_FILE} --xml reports.xml --html reports.html"
+            COMMAND="bin/codecept run Application -d -g AcceptanceTests-Job-${THISCHUNK} -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} ${TEST_FILE} --html reports.html"
         else
-            COMMAND="bin/codecept run Application -d -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} ${TEST_FILE} --xml reports.xml --html reports.html"
+            COMMAND="bin/codecept run Application -d -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} ${TEST_FILE} --html reports.html"
         fi
         ${CONTAINER_BIN} run -d --name ac-chrome-${SUFFIX} --network ${NETWORK} --network-alias chrome --tmpfs /dev/shm:rw,nosuid,nodev,noexec,relatime ${IMAGE_SELENIUM} >/dev/null
         ${CONTAINER_BIN} run -d --name ac-web-${SUFFIX} --network ${NETWORK} --network-alias web --add-host "host.docker.internal:host-gateway" $USERSET -v ${CORE_ROOT}:${CORE_ROOT} ${XDEBUG_MODE} -e XDEBUG_CONFIG="${XDEBUG_CONFIG}" ${IMAGE_PHP} php -S web:8000 -t ${CORE_ROOT} >/dev/null
@@ -549,30 +549,30 @@ case ${TEST_SUITE} in
                 ${CONTAINER_BIN} run --name mariadb-ac-install-${SUFFIX} --network ${NETWORK} -d -e MYSQL_ROOT_PASSWORD=funcp --tmpfs /var/lib/mysql/:rw,noexec,nosuid ${IMAGE_MARIADB} >/dev/null
                 waitFor mariadb-ac-install-${SUFFIX} 3306
                 CONTAINERPARAMS="-e typo3InstallMysqlDatabaseName=func_test -e typo3InstallMysqlDatabaseUsername=root -e typo3InstallMysqlDatabasePassword=funcp -e typo3InstallMysqlDatabaseHost=mariadb-ac-install-${SUFFIX}"
-                COMMAND="bin/codecept run Install -d -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} --env=mysql --xml reports.xml --html reports.html"
+                COMMAND="bin/codecept run Install -d -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} --env=mysql --html reports.html"
                 ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name ac-install-sqlite ${XDEBUG_MODE} -e XDEBUG_CONFIG="${XDEBUG_CONFIG}" ${CONTAINERPARAMS} ${IMAGE_PHP} ${COMMAND}
                 SUITE_EXIT_CODE=$?
                 ;;
             mysql)
                 ${CONTAINER_BIN} run --name mysql-ac-install-${SUFFIX} --network ${NETWORK} -d -e MYSQL_ROOT_PASSWORD=funcp --tmpfs /var/lib/mysql/:rw,noexec,nosuid ${IMAGE_MYSQL} >/dev/null
                 waitFor mysql-ac-install-${SUFFIX} 3306
                 CONTAINERPARAMS="-e typo3InstallMysqlDatabaseName=func_test -e typo3InstallMysqlDatabaseUsername=root -e typo3InstallMysqlDatabasePassword=funcp -e typo3InstallMysqlDatabaseHost=mysql-ac-install-${SUFFIX}"
-                COMMAND="bin/codecept run Install -d -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} --env=mysql --xml reports.xml --html reports.html"
+                COMMAND="bin/codecept run Install -d -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} --env=mysql --html reports.html"
                 ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name ac-install-sqlite ${XDEBUG_MODE} -e XDEBUG_CONFIG="${XDEBUG_CONFIG}" ${CONTAINERPARAMS} ${IMAGE_PHP} ${COMMAND}
                 SUITE_EXIT_CODE=$?
                 ;;
             postgres)
                 ${CONTAINER_BIN} run --name postgres-ac-install-${SUFFIX} --network ${NETWORK} -d -e POSTGRES_PASSWORD=funcp -e POSTGRES_USER=funcu --tmpfs /var/lib/postgresql/data:rw,noexec,nosuid ${IMAGE_POSTGRES} >/dev/null
                 waitFor postgres-ac-install-${SUFFIX} 5432
                 CONTAINERPARAMS="-e typo3InstallPostgresqlDatabasePort=5432 -e typo3InstallPostgresqlDatabaseName=${USER} -e typo3InstallPostgresqlDatabaseHost=postgres-ac-install-${SUFFIX} -e typo3InstallPostgresqlDatabaseUsername=funcu -e typo3InstallPostgresqlDatabasePassword=funcp"
-                COMMAND="bin/codecept run Install -d -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} --env=postgresql --xml reports.xml --html reports.html"
+                COMMAND="bin/codecept run Install -d -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} --env=postgresql --html reports.html"
                 ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name ac-install-sqlite ${XDEBUG_MODE} -e XDEBUG_CONFIG="${XDEBUG_CONFIG}" ${CONTAINERPARAMS} ${IMAGE_PHP} ${COMMAND}
                 SUITE_EXIT_CODE=$?
                 ;;
             sqlite)
                 mkdir -p "${CORE_ROOT}/typo3temp/var/tests/functional-sqlite-dbs/"
                 CONTAINERPARAMS="-e typo3DatabaseDriver=pdo_sqlite --tmpfs ${CORE_ROOT}/typo3temp/var/tests/functional-sqlite-dbs/:rw,noexec,nosuid,uid=${HOST_UID}"
-                COMMAND="bin/codecept run Install -d -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} --env=sqlite --xml reports.xml --html reports.html"
+                COMMAND="bin/codecept run Install -d -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} --env=sqlite --html reports.html"
                 ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name ac-install-sqlite ${XDEBUG_MODE} -e XDEBUG_CONFIG="${XDEBUG_CONFIG}" ${CONTAINERPARAMS} ${IMAGE_PHP} ${COMMAND}
                 SUITE_EXIT_CODE=$?
                 ;;

diff --git a/Build/gitlab-ci/nightly/acceptance-application.yml b/Build/gitlab-ci/nightly/acceptance-application.yml
@@ -12,9 +12,6 @@ acceptance application mariadb 10.3 php 8.1 min:
     paths:
       - typo3temp/var/tests/acceptance/typo3temp/var/log
       - typo3temp/var/tests/AcceptanceReports
-    reports:
-      junit:
-        - typo3temp/var/tests/AcceptanceReports/reports.xml
   parallel: 8
   script:
     - Build/Scripts/runTests.sh -s composerInstallMin -p 8.1
@@ -34,9 +31,6 @@ acceptance application mariadb 10.10 php 8.2 max:
     paths:
       - typo3temp/var/tests/acceptance/typo3temp/var/log
       - typo3temp/var/tests/AcceptanceReports
-    reports:
-      junit:
-        - typo3temp/var/tests/AcceptanceReports/reports.xml
   parallel: 8
   script:
     - Build/Scripts/runTests.sh -s composerInstallMax -p 8.2
@@ -52,9 +46,6 @@ acceptance application mysql 8.0 php 8.1 locked:
     paths:
       - typo3temp/var/tests/acceptance/typo3temp/var/log
       - typo3temp/var/tests/AcceptanceReports
-    reports:
-      junit:
-        - typo3temp/var/tests/AcceptanceReports/reports.xml
   parallel: 8
   script:
     - Build/Scripts/runTests.sh -s composerInstall -p 8.1
@@ -73,9 +64,6 @@ acceptance application mysql 8.0 php 8.1 max:
     paths:
       - typo3temp/var/tests/acceptance/typo3temp/var/log
       - typo3temp/var/tests/AcceptanceReports
-    reports:
-      junit:
-        - typo3temp/var/tests/AcceptanceReports/reports.xml
   parallel: 8
   script:
     - Build/Scripts/runTests.sh -s composerInstallMax -p 8.1
@@ -94,9 +82,6 @@ acceptance application mysql 8.0 php 8.1 min:
     paths:
       - typo3temp/var/tests/acceptance/typo3temp/var/log
       - typo3temp/var/tests/AcceptanceReports
-    reports:
-      junit:
-        - typo3temp/var/tests/AcceptanceReports/reports.xml
   parallel: 8
   script:
     - Build/Scripts/runTests.sh -s composerInstallMin -p 8.1
@@ -116,9 +101,6 @@ acceptance application sqlite php 8.2 max:
     paths:
       - typo3temp/var/tests/acceptance/typo3temp/var/log
       - typo3temp/var/tests/AcceptanceReports
-    reports:
-      junit:
-        - typo3temp/var/tests/AcceptanceReports/reports.xml
   parallel: 8
   script:
     - Build/Scripts/runTests.sh -s composerInstallMax -p 8.2
@@ -137,9 +119,6 @@ acceptance application sqlite php 8.1 min:
     paths:
       - typo3temp/var/tests/acceptance/typo3temp/var/log
       - typo3temp/var/tests/AcceptanceReports
-    reports:
-      junit:
-        - typo3temp/var/tests/AcceptanceReports/reports.xml
   parallel: 8
   script:
     - Build/Scripts/runTests.sh -s composerInstallMin -p 8.1

diff --git a/Build/gitlab-ci/nightly/acceptance-install.yml b/Build/gitlab-ci/nightly/acceptance-install.yml
@@ -27,9 +27,6 @@ acceptance install mariadb 10.3 php 8.1 min:
     when: on_failure
     paths:
       - typo3temp/var/tests/AcceptanceReports
-    reports:
-      junit:
-        - typo3temp/var/tests/AcceptanceReports/reports.xml
   script:
     - Build/Scripts/runTests.sh -s composerInstallMin -p 8.1
     - Build/Scripts/runTests.sh -s acceptanceInstall -d mariadb -i 10.3 -p 8.1
@@ -47,9 +44,6 @@ acceptance install mysql 8.0 php 8.2 max:
     when: on_failure
     paths:
       - typo3temp/var/tests/AcceptanceReports
-    reports:
-      junit:
-        - typo3temp/var/tests/AcceptanceReports/reports.xml
   script:
     - Build/Scripts/runTests.sh -s composerInstallMax -p 8.2
     - Build/Scripts/runTests.sh -s acceptanceInstall -d mysql -j 8.0 -p 8.2
@@ -66,9 +60,6 @@ acceptance install mysql 8.0 php 8.1 min:
     when: on_failure
     paths:
       - typo3temp/var/tests/AcceptanceReports
-    reports:
-      junit:
-        - typo3temp/var/tests/AcceptanceReports/reports.xml
   script:
     - Build/Scripts/runTests.sh -s composerInstallMin -p 8.1
     - Build/Scripts/runTests.sh -s acceptanceInstall -d mysql -j 8.0 -p 8.1
@@ -86,9 +77,6 @@ acceptance install postgres 15 php 8.2 max:
     when: on_failure
     paths:
       - typo3temp/var/tests/AcceptanceReports
-    reports:
-      junit:
-        - typo3temp/var/tests/AcceptanceReports/reports.xml
   script:
     - Build/Scripts/runTests.sh -s composerInstallMax -p 8.2
     - Build/Scripts/runTests.sh -s acceptanceInstall -d postgres -k 15 -p 8.2
@@ -105,9 +93,6 @@ acceptance install postgres 10 php 8.1 min:
     when: on_failure
     paths:
       - typo3temp/var/tests/AcceptanceReports
-    reports:
-      junit:
-        - typo3temp/var/tests/AcceptanceReports/reports.xml
   script:
     - Build/Scripts/runTests.sh -s composerInstallMin -p 8.1
     - Build/Scripts/runTests.sh -s acceptanceInstall -d postgres -k 10 -p 8.1
@@ -125,9 +110,6 @@ acceptance install sqlite php 8.2 max:
     when: on_failure
     paths:
       - typo3temp/var/tests/AcceptanceReports
-    reports:
-      junit:
-        - typo3temp/var/tests/AcceptanceReports/reports.xml
   script:
     - Build/Scripts/runTests.sh -s composerInstallMax -p 8.2
     - Build/Scripts/runTests.sh -s acceptanceInstall -d sqlite -p 8.2
@@ -144,9 +126,6 @@ acceptance install sqlite php 8.1 min:
     when: on_failure
     paths:
       - typo3temp/var/tests/AcceptanceReports
-    reports:
-      junit:
-        - typo3temp/var/tests/AcceptanceReports/reports.xml
   script:
     - Build/Scripts/runTests.sh -s composerInstallMin -p 8.1
     - Build/Scripts/runTests.sh -s acceptanceInstall -d sqlite -p 8.1
diff --git a/Build/gitlab-ci/pre-merge/acceptance-application.yml b/Build/gitlab-ci/pre-merge/acceptance-application.yml
@@ -9,9 +9,6 @@ acceptance application mariadb php 8.1 pre-merge:
     paths:
       - typo3temp/var/tests/acceptance/typo3temp/var/log
       - typo3temp/var/tests/AcceptanceReports
-    reports:
-      junit:
-        - typo3temp/var/tests/AcceptanceReports/reports.xml
   parallel: 13
   script:
     - Build/Scripts/runTests.sh -s composerInstall -p 8.1

diff --git a/Build/gitlab-ci/pre-merge/acceptance-install.yml b/Build/gitlab-ci/pre-merge/acceptance-install.yml
@@ -8,9 +8,6 @@ acceptance install mariadb 10.3 php 8.1 pre-merge:
     when: on_failure
     paths:
       - typo3temp/var/tests/AcceptanceReports
-    reports:
-      junit:
-        - typo3temp/var/tests/AcceptanceReports/reports.xml
   script:
     - Build/Scripts/runTests.sh -s composerInstall -p 8.1
     - Build/Scripts/runTests.sh -s acceptanceInstall -d mariadb -i 10.3 -p 8.1
@@ -25,9 +22,6 @@ acceptance install mysql 8.0 php 8.1 pre-merge:
     when: on_failure
     paths:
       - typo3temp/var/tests/AcceptanceReports
-    reports:
-      junit:
-        - typo3temp/var/tests/AcceptanceReports/reports.xml
   script:
     - Build/Scripts/runTests.sh -s composerInstall -p 8.1
     - Build/Scripts/runTests.sh -s acceptanceInstall -d mysql -j 8.0 -p 8.1
@@ -42,9 +36,6 @@ acceptance install postgres 10 php 8.2 pre-merge:
     when: on_failure
     paths:
       - typo3temp/var/tests/AcceptanceReports
-    reports:
-      junit:
-        - typo3temp/var/tests/AcceptanceReports/reports.xml
   script:
     - Build/Scripts/runTests.sh -s composerInstall -p 8.2
     - Build/Scripts/runTests.sh -s acceptanceInstall -d postgres -k 10 -p 8.2
@@ -59,9 +50,6 @@ acceptance install sqlite php 8.1 pre-merge:
     when: on_failure
     paths:
       - typo3temp/var/tests/AcceptanceReports
-    reports:
-      junit:
-        - typo3temp/var/tests/AcceptanceReports/reports.xml
   script:
     - Build/Scripts/runTests.sh -s composerInstall -p 8.1
     - Build/Scripts/runTests.sh -s acceptanceInstall -d sqlite -p 8.1