Skip to content

Commit

Permalink
[Travis] Fixed test matrix to cover more Kernel versions when testing (
Browse files Browse the repository at this point in the history
…#134)

* [Travis] Changed testing with dedicated cores to use latest Kernel also

* [Travis] Changed testing with shared cores to use Kernel 6.13

* [Tests] Add core for nor-NO language in multicore dedicated setup
  • Loading branch information
alongosz authored Feb 28, 2019
1 parent f2c1308 commit ee78184
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ matrix:
- php: 5.6
env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="4.10.4" CORES_SETUP="dedicated" COMPOSER_REQUIRE="ezsystems/ezpublish-kernel:~6.7.4@dev"
- php: 7.0
env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="4.10.4" CORES_SETUP="shared"
env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="4.10.4" CORES_SETUP="shared" COMPOSER_REQUIRE="ezsystems/ezpublish-kernel:~6.13.5@dev"
- php: 7.1
env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="4.10.4" CORES_SETUP="single" SOLR_CORES="collection1"
- php: 7.0
env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="6.4.2" CORES_SETUP="dedicated" COMPOSER_REQUIRE="ezsystems/ezpublish-kernel:~6.7.4@dev"
- php: 7.1
env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="6.4.2" CORES_SETUP="dedicated"
- php: 7.2
env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="6.5.1" CORES_SETUP="shared"
- php: 5.6
Expand Down
1 change: 1 addition & 0 deletions bin/.travis/init_solr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ default_cores[0]='core0'
default_cores[1]='core1'
default_cores[2]='core2'
default_cores[3]='core3'
default_cores[4]='core4'

SOLR_PORT=${SOLR_PORT:-8983}
SOLR_VERSION=${SOLR_VERSION:-6.6.5}
Expand Down
13 changes: 13 additions & 0 deletions tests/lib/Resources/config/multicore_dedicated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ parameters:
eng-US: endpoint1
por-PT: endpoint2
ger-DE: endpoint3
nor-NO: endpoint4
ezpublish.search.solr.default_endpoint: null
ezpublish.search.solr.main_translations_endpoint: null

Expand Down Expand Up @@ -77,3 +78,15 @@ services:
core: core3
tags:
- {name: ezpublish.search.solr.endpoint, alias: endpoint3}

ezpublish.search.solr.endpoint.endpoint4:
class: "%ezpublish.solr.endpoint.class%"
arguments:
-
scheme: http
host: localhost
port: 8983
path: /solr
core: core4
tags:
- {name: ezpublish.search.solr.endpoint, alias: endpoint4}

0 comments on commit ee78184

Please sign in to comment.