Skip to content

Commit a899529

Browse files
committed
Fixed the order for checkout and build YAML tests
1 parent 4036c19 commit a899529

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

.ci/Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
ARG PHP_VERSION=7.4-cli
22
FROM php:${PHP_VERSION}
33

4-
ARG STACK_VERSION
5-
ARG TEST_SUITE
6-
74
WORKDIR /usr/src/app
85

96
# Install git
@@ -40,7 +37,4 @@ COPY . .
4037
# Updating elasticsearch submodule
4138
RUN git submodule update --init --recursive
4239

43-
# Generating the YAML tests
44-
RUN php util/build_tests.php ${STACK_VERSION} ${TEST_SUITE}
45-
4640
CMD ["bash", ".ci/yaml-tests.sh"]

.ci/run-repository.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ docker build \
2626
--file .ci/Dockerfile \
2727
--tag elastic/elasticsearch-php \
2828
--build-arg PHP_VERSION=${PHP_VERSION} \
29-
--build-arg STACK_VERSION=${STACK_VERSION} \
30-
--build-arg TEST_SUITE=${TEST_SUITE} \
3129
.
3230

3331
echo -e "\033[1m>>>>> Run test:integration >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"

.ci/yaml-tests.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,8 @@
33
# Checkout the YAML test from Elasticsearch tag
44
php util/RestSpecRunner.php
55

6+
# Generate the YAML tests for PHPUnit
7+
php util/build_tests.php ${STACK_VERSION} ${TEST_SUITE}
8+
69
# Run YAML tests
710
vendor/bin/phpunit -c "phpunit-yaml-${TEST_SUITE}-tests.xml"

0 commit comments

Comments
 (0)