Skip to content

Commit

Permalink
Added junit log for phpunit
Browse files Browse the repository at this point in the history
  • Loading branch information
ezimuel committed Apr 17, 2020
1 parent 53a7bab commit 88b7e1c
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .ci/jobs/defaults.yml
Expand Up @@ -69,6 +69,6 @@
publishers:
- email:
recipients: infra-root+build@elastic.co
# - junit:
# results: "*-junit.xml"
# allow-empty-results: true
- junit:
results: "tests/*-junit.xml"
allow-empty-results: true
14 changes: 14 additions & 0 deletions .ci/jobs/elastic+elasticsearch-php+7.7.yml
@@ -0,0 +1,14 @@
---
- job:
name: elastic+elasticsearch-php+7.7
display-name: 'elastic / elasticsearch-php # 7.7'
description: Testing the elasticsearch-php 7.7 branch.
parameters:
- string:
name: branch_specifier
default: refs/heads/7.7
description: the Git branch specifier to build (<branchName>, <tagName>,
<commitId>, etc.)
triggers:
- github
- timed: '@daily'
2 changes: 1 addition & 1 deletion .ci/jobs/elastic+elasticsearch-php+7.x.yml
Expand Up @@ -11,4 +11,4 @@
<commitId>, etc.)
triggers:
- github
- timed: '@weekly'
- timed: '@daily'
2 changes: 1 addition & 1 deletion .ci/jobs/elastic+elasticsearch-php+pull-request.yml
Expand Up @@ -3,6 +3,7 @@
name: elastic+elasticsearch-php+pull-request
display-name: 'elastic / elasticsearch-php # pull-request'
description: Testing of elasticsearch-php pull requests.
junit_results: "tests/*-junit.xml"
scm:
- git:
branches:
Expand All @@ -16,4 +17,3 @@
github-hooks: true
status-context: clients-ci
cancel-builds-on-update: true
publishers: []
1 change: 1 addition & 0 deletions .ci/run-repository.sh
Expand Up @@ -35,6 +35,7 @@ repo=$(realpath $(dirname $(realpath -s $0))/../)
docker run \
--network=${network_name} \
--workdir="/usr/src/app" \
--volume=${repo}/tests:/usr/src/app/tests \
--env STACK_VERSION=${STACK_VERSION} \
--env TEST_SUITE=${TEST_SUITE} \
--env PHP_VERSION=${PHP_VERSION} \
Expand Down
2 changes: 1 addition & 1 deletion .ci/test-matrix.yml
@@ -1,6 +1,6 @@
---
STACK_VERSION:
- 7.6-SNAPSHOT
- 7.x-SNAPSHOT

PHP_VERSION:
- 7.4-cli
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Expand Up @@ -32,3 +32,6 @@ util/cache/

# Code coverage
build

# Junit test output
tests/*-junit.xml
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -29,7 +29,7 @@ jobs:

env:
global:
- STACK_VERSION="7.7.0-SNAPSHOT"
- STACK_VERSION="7.x-SNAPSHOT"

before_install:
- ./travis/run_es_docker.sh
Expand Down
3 changes: 3 additions & 0 deletions phpunit-integration.xml
Expand Up @@ -23,4 +23,7 @@
<directory suffix=".php">src</directory>
</whitelist>
</filter>
<logging>
<log type="junit" target="tests/yaml-test-junit.xml"/>
</logging>
</phpunit>
3 changes: 0 additions & 3 deletions tests/Elasticsearch/Tests/YamlRunnerTest.php
Expand Up @@ -832,9 +832,6 @@ public function yamlProvider(): array
$finder->files();
$finder->name('*.yml');

// *.yaml files should be included until the library is ES 6.0+ only
//$finder->name('*.yaml');

$filter = getenv('TEST_CASE') !== false ? getenv('TEST_CASE') : null;

/**
Expand Down

0 comments on commit 88b7e1c

Please sign in to comment.