diff --git a/tests/randomized/Makefile b/tests/randomized/Makefile index 2ca628bfc3..f407133748 100644 --- a/tests/randomized/Makefile +++ b/tests/randomized/Makefile @@ -23,13 +23,15 @@ publish.centos: \ publish.centos.7.4 \ publish.centos.8.0 \ publish.centos.8.1 \ - publish.centos.8.2 + publish.centos.8.2 \ + publish.centos.8.3 publish.buster: \ publish.buster.7.4 \ publish.buster.8.0 \ publish.buster.8.1 \ - publish.buster.8.2 + publish.buster.8.2 \ + publish.buster.8.3 publish.centos.%: docker buildx bake --push centos-$(*) @@ -45,13 +47,15 @@ pull.centos: \ pull.centos.7.4 \ pull.centos.8.0 \ pull.centos.8.1 \ - pull.centos.8.2 + pull.centos.8.2 \ + pull.centos.8.3 pull.buster: \ pull.buster.7.4 \ pull.buster.8.0 \ pull.buster.8.1 \ - pull.buster.8.2 + pull.buster.8.2 \ + pull.buster.8.3 pull.centos.%: @docker pull $(DOCKER_IMAGE_PREFIX)centos-$(*)-$(DOCKER_IMAGE_VERSION) diff --git a/tests/randomized/README.md b/tests/randomized/README.md index 71ad1fa0c1..dfa4247811 100644 --- a/tests/randomized/README.md +++ b/tests/randomized/README.md @@ -4,7 +4,7 @@ The purpose of randomized tests is to find edge cases that users could encounter The basic idea is to randomly generate a matrix of application configurations: - Apache/Nginx - - PHP 7.0-8.2 + - PHP 7.0-8.3 - Centos 7 / Debian Buster and to run a application with randomily generated execution paths, which involve a number of scenarios and integrations. diff --git a/tests/randomized/app/composer-8.3.json b/tests/randomized/app/composer-8.3.json new file mode 100644 index 0000000000..67badc659b --- /dev/null +++ b/tests/randomized/app/composer-8.3.json @@ -0,0 +1,17 @@ +{ + "autoload": { + "psr-4": { + "RandomizedTests\\": "./src/RandomizedTests" + } + }, + "config": { + "allow-plugins": { + "php-http/discovery": true + } + }, + "require": { + "elasticsearch/elasticsearch": "^8.0", + "guzzlehttp/guzzle": "7.*", + "datadog/dd-trace": "0.82.0" + } +} diff --git a/tests/randomized/config/platforms.php b/tests/randomized/config/platforms.php index 197a4e541e..32d441b487 100644 --- a/tests/randomized/config/platforms.php +++ b/tests/randomized/config/platforms.php @@ -6,6 +6,7 @@ define('OS', [ 'centos7' => [ 'php' => [ + '8.3', '8.2', '8.1', '8.0', @@ -18,6 +19,7 @@ ], 'buster' => [ 'php' => [ + '8.3', '8.2', '8.1', '8.0', diff --git a/tests/randomized/docker-compose.yml b/tests/randomized/docker-compose.yml index 67be541ebb..aaf877234c 100644 --- a/tests/randomized/docker-compose.yml +++ b/tests/randomized/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3' - services: centos-7.0: build: @@ -111,3 +109,21 @@ services: args: PHP_MAJOR_MINOR: "8.2" image: 'datadog/dd-trace-ci:php-randomizedtests-buster-8.2-2' + + centos-8.3: + build: + context: docker + dockerfile: centos.Dockerfile + x-bake: *bake + args: + PHP_MAJOR_MINOR: "8.3" + image: 'datadog/dd-trace-ci:php-randomizedtests-centos7-8.3-2' + + buster-8.3: + build: + context: docker + dockerfile: buster.Dockerfile + x-bake: *bake + args: + PHP_MAJOR_MINOR: "8.3" + image: 'datadog/dd-trace-ci:php-randomizedtests-buster-8.3-2' diff --git a/tests/randomized/docker/buster.Dockerfile b/tests/randomized/docker/buster.Dockerfile index 2cf82a60a1..1d7e5ef329 100644 --- a/tests/randomized/docker/buster.Dockerfile +++ b/tests/randomized/docker/buster.Dockerfile @@ -33,7 +33,7 @@ RUN chmod +x /scripts/wait-for.sh # - Install golang RUN set -eux; \ GO_ARCHITECTURE=$(if [ `uname -m` = "aarch64" ]; then echo "arm64"; else echo "amd64"; fi); \ - curl -L --output golang.tar.gz https://go.dev/dl/go1.18.3.linux-${GO_ARCHITECTURE}.tar.gz; \ + curl -L --output golang.tar.gz https://go.dev/dl/go1.22.1.linux-${GO_ARCHITECTURE}.tar.gz; \ rm -rf /usr/local/go && tar -C /usr/local -xzf golang.tar.gz; # - Download vegeta RUN set -eux; \ diff --git a/tests/randomized/docker/centos.Dockerfile b/tests/randomized/docker/centos.Dockerfile index 29d470cb61..9e562dc920 100644 --- a/tests/randomized/docker/centos.Dockerfile +++ b/tests/randomized/docker/centos.Dockerfile @@ -48,7 +48,7 @@ RUN chmod +x /scripts/wait-for.sh # - Install golang RUN set -eux; \ GO_ARCHITECTURE=$(if [ `uname -m` = "aarch64" ]; then echo "arm64"; else echo "amd64"; fi); \ - curl -L --output golang.tar.gz https://go.dev/dl/go1.18.3.linux-${GO_ARCHITECTURE}.tar.gz; \ + curl -L --output golang.tar.gz https://go.dev/dl/go1.22.1.linux-${GO_ARCHITECTURE}.tar.gz; \ rm -rf /usr/local/go && tar -C /usr/local -xzf golang.tar.gz; # - Download vegeta RUN set -eux; \ diff --git a/tests/randomized/lib/templates/docker-compose.template.yml b/tests/randomized/lib/templates/docker-compose.template.yml index 782c49da43..76daecfdce 100644 --- a/tests/randomized/lib/templates/docker-compose.template.yml +++ b/tests/randomized/lib/templates/docker-compose.template.yml @@ -1,5 +1,3 @@ -version: '3.7' - volumes: composer_cache: @@ -42,4 +40,4 @@ services: networks: randomized_tests: name: randomized_tests_baseservices - external: true \ No newline at end of file + external: true