Skip to content

Commit eb07e51

Browse files
committed
Updated YAML tests using elasticsearch-clients-tests
1 parent 416bc39 commit eb07e51

30 files changed

+733
-553
lines changed

.buildkite/Dockerfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG PHP_VERSION=8.0-cli
1+
ARG PHP_VERSION=8.4-cli
22
FROM php:${PHP_VERSION}
33

44
WORKDIR /usr/src/app
@@ -32,11 +32,9 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
3232
# Print composer version
3333
RUN composer --version
3434

35-
COPY composer.json .
35+
COPY . .
3636

3737
# Install dependencies with composer
3838
RUN composer install --no-progress > /dev/null
3939

40-
COPY . .
41-
42-
CMD ["bash", ".buildkite/yaml-tests.sh"]
40+
CMD ["bash", ".buildkite/run-tests.sh"]

.buildkite/run-repository.sh renamed to .buildkite/build-tests.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@
22
# parameters are available to this script
33

44
# STACK_VERSION -- version e.g Major.Minor.Patch(-Prelease)
5-
# TEST_SUITE -- which test suite to run: oss or xpack
5+
# TEST_GROUP -- which test group to run: stack or serverless
66
# ELASTICSEARCH_URL -- The url at which elasticsearch is reachable, a default is composed based on STACK_VERSION and TEST_SUITE
77
# PHP_VERSION -- PHP version (defined in test-matrix.yml, a default is hardcoded here)
88
script_path=$(dirname $(realpath -s $0))
9-
source $script_path/functions/imports.sh
109
set -euo pipefail
1110

12-
PHP_VERSION=${PHP_VERSION-8.2-cli}
11+
PHP_VERSION=${PHP_VERSION-8.4-cli}
1312
ELASTICSEARCH_URL=${ELASTICSEARCH_URL-"$elasticsearch_url"}
1413
elasticsearch_container=${elasticsearch_container-}
1514

1615
echo -e "\033[34;1mINFO:\033[0m VERSION ${STACK_VERSION}\033[0m"
17-
echo -e "\033[34;1mINFO:\033[0m TEST_SUITE ${TEST_SUITE}\033[0m"
16+
echo -e "\033[34;1mINFO:\033[0m TEST_GROUP ${TEST_GROUP}\033[0m"
1817
echo -e "\033[34;1mINFO:\033[0m URL ${ELASTICSEARCH_URL}\033[0m"
1918
echo -e "\033[34;1mINFO:\033[0m CONTAINER ${elasticsearch_container}\033[0m"
2019
echo -e "\033[34;1mINFO:\033[0m PHP_VERSION ${PHP_VERSION}\033[0m"
@@ -37,7 +36,7 @@ docker run \
3736
--workdir="/usr/src/app" \
3837
--volume=${repo}/tests:/usr/src/app/tests \
3938
--env STACK_VERSION=${STACK_VERSION} \
40-
--env TEST_SUITE=${TEST_SUITE} \
39+
--env TEST_GROUP=${TEST_GROUP} \
4140
--env PHP_VERSION=${PHP_VERSION} \
4241
--env ELASTICSEARCH_URL=${ELASTICSEARCH_URL} \
4342
--ulimit nofile=65535:65535 \

.buildkite/certs/ca.crt

Lines changed: 0 additions & 20 deletions
This file was deleted.

.buildkite/certs/ca.key

Lines changed: 0 additions & 27 deletions
This file was deleted.

.buildkite/certs/testnode.crt

Lines changed: 0 additions & 19 deletions
This file was deleted.

.buildkite/certs/testnode.key

Lines changed: 0 additions & 27 deletions
This file was deleted.

.buildkite/certs/testnode_san.crt

Lines changed: 0 additions & 20 deletions
This file was deleted.

.buildkite/certs/testnode_san.key

Lines changed: 0 additions & 27 deletions
This file was deleted.

.buildkite/docker/Dockerfile

Lines changed: 0 additions & 5 deletions
This file was deleted.

.buildkite/functions/cleanup.sh

Lines changed: 0 additions & 67 deletions
This file was deleted.

0 commit comments

Comments
 (0)