diff --git a/.gitlab/generate-package.php b/.gitlab/generate-package.php index dace28e5f5..1e587faa35 100644 --- a/.gitlab/generate-package.php +++ b/.gitlab/generate-package.php @@ -76,6 +76,19 @@ function package_extension_jobs(array $platform, string $kind = "all"): array return $jobs; } +/** + * Emits a job script step that runs each listed system-tests scenario in sequence. + * Every scenario runs even when an earlier one fails; the step then fails, listing the failed scenarios. + * + * @param string $scenarios Shell words expanding to the scenario names: a variable reference such as '$TESTSUITE', or literal names. + */ +function system_tests_run_scenarios(string $scenarios): void +{ +?> + - FAILED=""; for S in ; do echo "=== Running $S ==="; ./run.sh $S || FAILED="$FAILED $S"; done; if [ -n "$FAILED" ]; then echo "Failed scenarios:$FAILED"; exit 1; fi + "x86_64-unknown-linux-gnu", @@ -1553,9 +1566,9 @@ function package_extension_jobs(array $platform, string $kind = "all"): array - APPSEC_RUNTIME_ACTIVATION - INTEGRATIONS - CROSSED_TRACING_LIBRARIES - - DEBUGGER_PROBES_SNAPSHOT_WITH_SCM + - "DEBUGGER_PROBES_SNAPSHOT_WITH_SCM DEBUGGER_EXPRESSION_LANGUAGE DEBUGGER_INPRODUCT_ENABLEMENT" script: - - ./run.sh $TESTSUITE + "System Tests: [php-fpm-8.5, default]": extends: .system_tests @@ -1578,9 +1591,16 @@ function package_extension_jobs(array $platform, string $kind = "all"): array - APPSEC_RUNTIME_ACTIVATION - INTEGRATIONS - CROSSED_TRACING_LIBRARIES - - DEBUGGER_PROBES_SNAPSHOT_WITH_SCM + - "DEBUGGER_PROBES_SNAPSHOT_WITH_SCM DEBUGGER_TELEMETRY DEBUGGER_EXCEPTION_REPLAY" + script: + + +"System Tests: [apache-mod-8.0-zts, debugger]": + extends: .system_tests + variables: + BUILD_SH_ARGS: "-i weblog -w apache-mod-8.0-zts php" script: - - ./run.sh $TESTSUITE + # THREAD_CONTEXT_SHARING needs CWS, which needs the kernel filesystems and the