Skip to content

Commit 3259252

Browse files
Leiyksbwoebi
Leiyks
and
bwoebi
authored
Fix some test failures / flakiness (#3376)
* test: add debug logs Signed-off-by: Alexandre Rulleau <[email protected]> * test: debug sqlsrv integration Signed-off-by: Alexandre Rulleau <[email protected]> * Update composer to version 2 Composer version 1 has been turned off, so we no longer have to care. Signed-off-by: Bob Weinand <[email protected]> * Exclude ext/posix/tests/posix_getgrnam_basic.phpt Signed-off-by: Bob Weinand <[email protected]> * Fix flow testsuite Signed-off-by: Bob Weinand <[email protected]> --------- Signed-off-by: Alexandre Rulleau <[email protected]> Signed-off-by: Bob Weinand <[email protected]> Co-authored-by: Bob Weinand <[email protected]>
1 parent 8bef9c8 commit 3259252

File tree

16 files changed

+30
-18
lines changed

16 files changed

+30
-18
lines changed

‎.gitlab/generate-tracer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ function before_script_steps() {
180180
stage: test
181181
tags: [ "arch:${ARCH}" ]
182182
image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-5
183-
timeout: 30m
183+
timeout: 60m
184184
variables:
185185
host_os: linux-gnu
186186
COMPOSER_MEMORY_LIMIT: "-1"

‎docker-compose.linux.override.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ x-aliases:
1515
services:
1616
# --- Alpine ---
1717
'8.0-alpine': { <<: *linux_php_service }
18-
# --- Buster ---
19-
'7.0-buster': { <<: *linux_php_service }
20-
'7.1-buster': { <<: *linux_php_service }
21-
'7.2-buster': { <<: *linux_php_service }
22-
'7.3-buster': { <<: *linux_php_service }
23-
'7.4-buster': { <<: *linux_php_service }
24-
'8.0-buster': { <<: *linux_php_service }
25-
'8.1-buster': { <<: *linux_php_service }
26-
'8.2-buster': { <<: *linux_php_service }
27-
'8.3-buster': { <<: *linux_php_service }
28-
'8.4-buster': { <<: *linux_php_service }
18+
# --- Bookworm ---
19+
'7.0-bookworm': { <<: *linux_php_service }
20+
'7.1-bookworm': { <<: *linux_php_service }
21+
'7.2-bookworm': { <<: *linux_php_service }
22+
'7.3-bookworm': { <<: *linux_php_service }
23+
'7.4-bookworm': { <<: *linux_php_service }
24+
'8.0-bookworm': { <<: *linux_php_service }
25+
'8.1-bookworm': { <<: *linux_php_service }
26+
'8.2-bookworm': { <<: *linux_php_service }
27+
'8.3-bookworm': { <<: *linux_php_service }
28+
'8.4-bookworm': { <<: *linux_php_service }

‎dockerfiles/ci/alpine/php-8.0/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ RUN set -eux; \
9090
switch-php ${PHP_VERSION}-debug;
9191

9292
# Install Composer
93-
COPY --from=composer:1 /usr/bin/composer /usr/local/bin/composer
93+
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
9494

9595
COPY welcome /etc/motd
9696

‎dockerfiles/ci/bookworm/php-8.0/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ RUN set -eux; \
8585
switch-php debug;
8686

8787
# Install Composer
88-
COPY --from=composer:1 /usr/bin/composer /usr/local/bin/composer
88+
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
8989

9090
COPY welcome /etc/motd
9191
RUN sudo sed -i "s/VERSIONS/$(ls $PHP_INSTALL_DIR | xargs)/" /etc/motd

‎dockerfiles/ci/bookworm/php-8.1/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ RUN set -eux; \
8686
switch-php debug;
8787

8888
# Install Composer
89-
COPY --from=composer:1 /usr/bin/composer /usr/local/bin/composer
89+
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
9090

9191
COPY welcome /etc/motd
9292
RUN sudo sed -i "s/VERSIONS/$(ls $PHP_INSTALL_DIR | xargs)/" /etc/motd

‎dockerfiles/ci/buster/php-8.0/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ RUN set -eux; \
8484
switch-php debug;
8585

8686
# Install Composer
87-
COPY --from=composer:1 /usr/bin/composer /usr/local/bin/composer
87+
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
8888

8989
COPY welcome /etc/motd
9090
RUN sudo sed -i "s/VERSIONS/$(ls $PHP_INSTALL_DIR | xargs)/" /etc/motd

‎dockerfiles/ci/buster/php-8.1/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ RUN set -eux; \
8585
switch-php debug;
8686

8787
# Install Composer
88-
COPY --from=composer:1 /usr/bin/composer /usr/local/bin/composer
88+
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
8989

9090
COPY welcome /etc/motd
9191
RUN sudo sed -i "s/VERSIONS/$(ls $PHP_INSTALL_DIR | xargs)/" /etc/motd

‎dockerfiles/ci/xfail_tests/7.4.list‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ ext/phar/tests/phar_buildfromiterator8.phpt
264264
ext/phar/tests/phar_oo_002.phpt
265265
ext/phar/tests/phar_oo_005.phpt
266266
ext/phar/tests/phar_oo_007.phpt
267+
ext/posix/tests/posix_getgrnam_basic.phpt
267268
ext/readline/tests/libedit_callback_handler_install_001.phpt
268269
ext/readline/tests/libedit_callback_handler_remove_001.phpt
269270
ext/reflection/tests/009.phpt

‎dockerfiles/ci/xfail_tests/8.0.list‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ ext/phar/tests/phar_metadata_write4.phpt
311311
ext/phar/tests/phar_oo_002.phpt
312312
ext/phar/tests/phar_oo_005.phpt
313313
ext/phar/tests/phar_oo_007.phpt
314+
ext/posix/tests/posix_getgrnam_basic.phpt
314315
ext/readline/tests/libedit_callback_handler_install_001.phpt
315316
ext/readline/tests/libedit_callback_handler_remove_001.phpt
316317
ext/reflection/tests/009.phpt
@@ -562,3 +563,4 @@ ext/standard/tests/http/ghsa-hgf5-96fm-v528-003.phpt
562563
ext/standard/tests/http/ghsa-hgf5-96fm-v528-002.phpt
563564
ext/standard/tests/http/ghsa-hgf5-96fm-v528-001.phpt
564565
ext/standard/tests/http/ignore_errors.phpt
566+
ext/standard/tests/general_functions/proc_open02.phpt

‎dockerfiles/ci/xfail_tests/8.1.list‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ ext/phar/tests/phar_metadata_write4.phpt
128128
ext/phar/tests/phar_oo_002.phpt
129129
ext/phar/tests/phar_oo_005.phpt
130130
ext/phar/tests/phar_oo_007.phpt
131+
ext/posix/tests/posix_getgrnam_basic.phpt
131132
ext/readline/tests/libedit_callback_handler_install_001.phpt
132133
ext/readline/tests/libedit_callback_handler_remove_001.phpt
133134
ext/simplexml/tests/bug51615.phpt

0 commit comments

Comments
 (0)