Skip to content

Commit 19670e2

Browse files
authored
ci: add PHP 8.3 to randomized tests (#2721)
1 parent 231d5bd commit 19670e2

File tree

8 files changed

+49
-12
lines changed

8 files changed

+49
-12
lines changed

tests/randomized/Makefile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@ publish.centos: \
2323
publish.centos.7.4 \
2424
publish.centos.8.0 \
2525
publish.centos.8.1 \
26-
publish.centos.8.2
26+
publish.centos.8.2 \
27+
publish.centos.8.3
2728

2829
publish.buster: \
2930
publish.buster.7.4 \
3031
publish.buster.8.0 \
3132
publish.buster.8.1 \
32-
publish.buster.8.2
33+
publish.buster.8.2 \
34+
publish.buster.8.3
3335

3436
publish.centos.%:
3537
docker buildx bake --push centos-$(*)
@@ -45,13 +47,15 @@ pull.centos: \
4547
pull.centos.7.4 \
4648
pull.centos.8.0 \
4749
pull.centos.8.1 \
48-
pull.centos.8.2
50+
pull.centos.8.2 \
51+
pull.centos.8.3
4952

5053
pull.buster: \
5154
pull.buster.7.4 \
5255
pull.buster.8.0 \
5356
pull.buster.8.1 \
54-
pull.buster.8.2
57+
pull.buster.8.2 \
58+
pull.buster.8.3
5559

5660
pull.centos.%:
5761
@docker pull $(DOCKER_IMAGE_PREFIX)centos-$(*)-$(DOCKER_IMAGE_VERSION)

tests/randomized/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The purpose of randomized tests is to find edge cases that users could encounter
44

55
The basic idea is to randomly generate a matrix of application configurations:
66
- Apache/Nginx
7-
- PHP 7.0-8.2
7+
- PHP 7.0-8.3
88
- Centos 7 / Debian Buster
99

1010
and to run a application with randomily generated execution paths, which involve a number of scenarios and integrations.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"autoload": {
3+
"psr-4": {
4+
"RandomizedTests\\": "./src/RandomizedTests"
5+
}
6+
},
7+
"config": {
8+
"allow-plugins": {
9+
"php-http/discovery": true
10+
}
11+
},
12+
"require": {
13+
"elasticsearch/elasticsearch": "^8.0",
14+
"guzzlehttp/guzzle": "7.*",
15+
"datadog/dd-trace": "0.82.0"
16+
}
17+
}

tests/randomized/config/platforms.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
define('OS', [
77
'centos7' => [
88
'php' => [
9+
'8.3',
910
'8.2',
1011
'8.1',
1112
'8.0',
@@ -18,6 +19,7 @@
1819
],
1920
'buster' => [
2021
'php' => [
22+
'8.3',
2123
'8.2',
2224
'8.1',
2325
'8.0',

tests/randomized/docker-compose.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: '3'
2-
31
services:
42
centos-7.0:
53
build:
@@ -111,3 +109,21 @@ services:
111109
args:
112110
PHP_MAJOR_MINOR: "8.2"
113111
image: 'datadog/dd-trace-ci:php-randomizedtests-buster-8.2-2'
112+
113+
centos-8.3:
114+
build:
115+
context: docker
116+
dockerfile: centos.Dockerfile
117+
x-bake: *bake
118+
args:
119+
PHP_MAJOR_MINOR: "8.3"
120+
image: 'datadog/dd-trace-ci:php-randomizedtests-centos7-8.3-2'
121+
122+
buster-8.3:
123+
build:
124+
context: docker
125+
dockerfile: buster.Dockerfile
126+
x-bake: *bake
127+
args:
128+
PHP_MAJOR_MINOR: "8.3"
129+
image: 'datadog/dd-trace-ci:php-randomizedtests-buster-8.3-2'

tests/randomized/docker/buster.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ RUN chmod +x /scripts/wait-for.sh
3333
# - Install golang
3434
RUN set -eux; \
3535
GO_ARCHITECTURE=$(if [ `uname -m` = "aarch64" ]; then echo "arm64"; else echo "amd64"; fi); \
36-
curl -L --output golang.tar.gz https://go.dev/dl/go1.18.3.linux-${GO_ARCHITECTURE}.tar.gz; \
36+
curl -L --output golang.tar.gz https://go.dev/dl/go1.22.1.linux-${GO_ARCHITECTURE}.tar.gz; \
3737
rm -rf /usr/local/go && tar -C /usr/local -xzf golang.tar.gz;
3838
# - Download vegeta
3939
RUN set -eux; \

tests/randomized/docker/centos.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ RUN chmod +x /scripts/wait-for.sh
4848
# - Install golang
4949
RUN set -eux; \
5050
GO_ARCHITECTURE=$(if [ `uname -m` = "aarch64" ]; then echo "arm64"; else echo "amd64"; fi); \
51-
curl -L --output golang.tar.gz https://go.dev/dl/go1.18.3.linux-${GO_ARCHITECTURE}.tar.gz; \
51+
curl -L --output golang.tar.gz https://go.dev/dl/go1.22.1.linux-${GO_ARCHITECTURE}.tar.gz; \
5252
rm -rf /usr/local/go && tar -C /usr/local -xzf golang.tar.gz;
5353
# - Download vegeta
5454
RUN set -eux; \

tests/randomized/lib/templates/docker-compose.template.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: '3.7'
2-
31
volumes:
42
composer_cache:
53

@@ -42,4 +40,4 @@ services:
4240
networks:
4341
randomized_tests:
4442
name: randomized_tests_baseservices
45-
external: true
43+
external: true

0 commit comments

Comments
 (0)