Skip to content

Commit 88b7e1c

Browse files
committed
Added junit log for phpunit
1 parent 53a7bab commit 88b7e1c

10 files changed

+28
-10
lines changed

.ci/jobs/defaults.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,6 @@
6969
publishers:
7070
- email:
7171
recipients: [email protected]
72-
# - junit:
73-
# results: "*-junit.xml"
74-
# allow-empty-results: true
72+
- junit:
73+
results: "tests/*-junit.xml"
74+
allow-empty-results: true
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
- job:
3+
name: elastic+elasticsearch-php+7.7
4+
display-name: 'elastic / elasticsearch-php # 7.7'
5+
description: Testing the elasticsearch-php 7.7 branch.
6+
parameters:
7+
- string:
8+
name: branch_specifier
9+
default: refs/heads/7.7
10+
description: the Git branch specifier to build (<branchName>, <tagName>,
11+
<commitId>, etc.)
12+
triggers:
13+
- github
14+
- timed: '@daily'

.ci/jobs/elastic+elasticsearch-php+7.x.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
<commitId>, etc.)
1212
triggers:
1313
- github
14-
- timed: '@weekly'
14+
- timed: '@daily'

.ci/jobs/elastic+elasticsearch-php+pull-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
name: elastic+elasticsearch-php+pull-request
44
display-name: 'elastic / elasticsearch-php # pull-request'
55
description: Testing of elasticsearch-php pull requests.
6+
junit_results: "tests/*-junit.xml"
67
scm:
78
- git:
89
branches:
@@ -16,4 +17,3 @@
1617
github-hooks: true
1718
status-context: clients-ci
1819
cancel-builds-on-update: true
19-
publishers: []

.ci/run-repository.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ repo=$(realpath $(dirname $(realpath -s $0))/../)
3535
docker run \
3636
--network=${network_name} \
3737
--workdir="/usr/src/app" \
38+
--volume=${repo}/tests:/usr/src/app/tests \
3839
--env STACK_VERSION=${STACK_VERSION} \
3940
--env TEST_SUITE=${TEST_SUITE} \
4041
--env PHP_VERSION=${PHP_VERSION} \

.ci/test-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
STACK_VERSION:
3-
- 7.6-SNAPSHOT
3+
- 7.x-SNAPSHOT
44

55
PHP_VERSION:
66
- 7.4-cli

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,6 @@ util/cache/
3232

3333
# Code coverage
3434
build
35+
36+
# Junit test output
37+
tests/*-junit.xml

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
env:
3131
global:
32-
- STACK_VERSION="7.7.0-SNAPSHOT"
32+
- STACK_VERSION="7.x-SNAPSHOT"
3333

3434
before_install:
3535
- ./travis/run_es_docker.sh

phpunit-integration.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,7 @@
2323
<directory suffix=".php">src</directory>
2424
</whitelist>
2525
</filter>
26+
<logging>
27+
<log type="junit" target="tests/yaml-test-junit.xml"/>
28+
</logging>
2629
</phpunit>

tests/Elasticsearch/Tests/YamlRunnerTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -832,9 +832,6 @@ public function yamlProvider(): array
832832
$finder->files();
833833
$finder->name('*.yml');
834834

835-
// *.yaml files should be included until the library is ES 6.0+ only
836-
//$finder->name('*.yaml');
837-
838835
$filter = getenv('TEST_CASE') !== false ? getenv('TEST_CASE') : null;
839836

840837
/**

0 commit comments

Comments
 (0)