Skip to content

Commit 416482c

Browse files
committed
test(sidecar): skip root FPM test under apache2handler SAPI
Apache2handler uses a static shared instance on the same port as our FPM+Nginx setup, causing port conflicts. Skip the test in that case; it still runs under cli-server and cgi-fcgi CI jobs.
1 parent 0c16687 commit 416482c

15 files changed

Lines changed: 390 additions & 618 deletions

File tree

.gitlab/build-sidecar.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ set -u
1313

1414
suffix="${1:-}"
1515

16+
# Install automake/libtool required by libdd-libunwind-sys build.rs (autoreconf step)
17+
if [ "${suffix}" = "-alpine" ]; then
18+
apk add --no-cache automake libtool
19+
elif command -v apt-get &>/dev/null; then
20+
apt-get install -y --no-install-recommends automake libtool
21+
elif command -v yum &>/dev/null; then
22+
yum install -y automake libtool
23+
fi
24+
1625
# Workaround "error: failed to run custom build command for `aws-lc-sys v0.20.0`"
1726
if [ "${suffix}" = "-alpine" ]; then
1827
cargo install --force --locked bindgen-cli

.gitlab/generate-tracer.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,9 @@ function before_script_steps($with_docker_auth = false) {
560560
foreach ($type_jobs as $target => $versions):
561561
foreach ($versions as $major_minor):
562562
$sapis = $type == "web" && version_compare($major_minor, "7.2", ">=") ? ["cli-server", "cgi-fcgi", "apache2handler"] : [""];
563+
if ($target == "test_web_custom" && in_array("cli-server", $sapis)) {
564+
$sapis[] = "fpm-fcgi";
565+
}
563566
foreach ($sapis as $sapi):
564567
?>
565568
"<?= $target ?>: [<?= $major_minor, $sapi ? ", $sapi" : "" ?>]":

0 commit comments

Comments
 (0)