Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IBX-1699: Bump requirement for Solr #228

Merged
merged 6 commits into from
Jan 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ cache:
env:
global:
- COMPOSER_MEMORY_LIMIT=6G
- TEST_CONFIG="phpunit-integration-legacy-solr.xml"

matrix:
include:
Expand All @@ -24,15 +25,15 @@ matrix:
env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="7.7.3" CORES_SETUP="single" SOLR_CORES="collection1"
- php: 7.1
env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="7.7.3" CORES_SETUP="cloud" SOLR_CLOUD="yes"
# Solr 8.6.3
# Solr 8.11.1
- php: 7.1
env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="8.6.3" CORES_SETUP="dedicated"
env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="8.11.1" CORES_SETUP="dedicated"
- php: 7.1
env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="8.6.3" CORES_SETUP="shared"
env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="8.11.1" CORES_SETUP="shared"
- php: 7.1
env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="8.6.3" CORES_SETUP="single" SOLR_CORES="collection1"
env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="8.11.1" CORES_SETUP="single" SOLR_CORES="collection1"
- php: 7.1
env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="8.6.3" CORES_SETUP="cloud" SOLR_CLOUD="yes"
env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="8.11.1" CORES_SETUP="cloud" SOLR_CLOUD="yes"
# test only master and stable branches (+ Pull requests against those)
branches:
only:
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
[![License](https://img.shields.io/github/license/ezsystems/ezplatform-solr-search-engine.svg?style=flat-square)](LICENSE)

Solr Search Engine Bundle for use with:
- v2.0+: eZ Platform 2.5LTS+ *(bundled out of the box)* with Solr 8.11.1
- v1.6+: eZ Platform 2.5LTS+ *(bundled out of the box)* with Solr 6.x _(recommended: 6.6 which is an LTS)_
- v1.5: eZ Platform 1.7LTS & 1.13LTS *(bundled out of the box)* with Solr 6.x or 4.10.4 _(recommended: 6.6 which is an LTS, and certain features only work on Solr 6)_
- v1.0.x: eZ Publish Platform Enterprise 5.4.5+ *(optional, not as feature rich but helpful for scaling filtering queries)* with Solr 4.10.4
Expand Down
10 changes: 5 additions & 5 deletions bin/.travis/init_solr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ default_shards=('shard0')

SOLR_PORT=${SOLR_PORT:-8983}
SOLR_DIR=${SOLR_DIR:-'__solr'}
SOLR_VERSION=${SOLR_VERSION:-'7.7.2'}
SOLR_VERSION=${SOLR_VERSION:-'8.11.1'}
SOLR_INSTALL_DIR="${SOLR_DIR}/${SOLR_VERSION}"
SOLR_DEBUG=${SOLR_DEBUG:-false}
SOLR_HOME=${SOLR_HOME:-'ezcloud'}
Expand Down Expand Up @@ -44,8 +44,8 @@ fi

download() {
case ${SOLR_VERSION} in
# PS!!: Append versions and don't remove old once, kernel uses this script!
7.7.* | 8.[5-8].* )
# PS!!: Append versions and don't remove old ones, kernel uses this script!
7.7.* | 8.[5-8].* | 8.11.* )
glye marked this conversation as resolved.
Show resolved Hide resolved
url="http://archive.apache.org/dist/lucene/solr/${SOLR_VERSION}/solr-${SOLR_VERSION}.tgz"
;;
*)
Expand Down Expand Up @@ -132,7 +132,7 @@ wait_for_solr(){
done
}

# Run for Solr 7
# Run for Solr 7+
solr_run() {
echo "Running with version ${SOLR_VERSION} in standalone mode"
echo "Starting solr on port ${SOLR_PORT}..."
Expand All @@ -144,7 +144,7 @@ solr_run() {
solr_create_cores
}

# Create cores for Solr 7
# Create cores for Solr 7+
solr_create_cores() {
home_dir="${SOLR_INSTALL_DIR}/server/${SOLR_HOME}"
template_dir="${home_dir}/template"
Expand Down
12 changes: 6 additions & 6 deletions bin/generate-solr-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
set -e

# Default paramters, if not overloaded by user arguments
DESTINATION_DIR=.platform/configsets/solr6/conf
SOLR_VERSION=7.7.2
DESTINATION_DIR=.platform/configsets/solr8/conf
SOLR_VERSION=8.11.1
FORCE=false
SOLR_INSTALL_DIR=""

Expand All @@ -19,8 +19,8 @@ Help (this text):

Usage with eZ Platform Cloud (arguments here can be skipped as they have default values):
./vendor/ezsystems/ezplatform-solr-search-engine/bin/generate-solr-config.sh \\
--destination-dir=.platform/configsets/solr6/conf \\
--solr-version=7.7.2
--destination-dir=.platform/configsets/solr8/conf \\
--solr-version=8.11.1

Usage with on-premise version of Solr:
./vendor/ezsystems/ezplatform-solr-search-engine/bin/generate-solr-config.sh \\
Expand All @@ -33,7 +33,7 @@ Warning:

Arguments:
[--destination-dir=<dest.dir>] : Location where solr config should be stored
Default value is .platform/configsets/solr6/conf
Default value is .platform/configsets/solr8/conf
[-f|--force] : Overwrite destination-dir if it already exists
[--solr-install-dir] : Existing downloaded Solr install to copy base config from.
[--solr-version] : Solr version to download & copy base config from, used only if --solr-install-dir is unset
Expand Down Expand Up @@ -94,7 +94,7 @@ if [ -e $DESTINATION_DIR ]; then
fi

if [ "$SOLR_INSTALL_DIR" == "" ]; then
# If we where not provided existing install directory we'll temporary download version of solr 7 to generate config.
# If we were not provided an existing install directory we'll temporarily download a version of solr to generate config.
GENERATE_SOLR_TMPDIR=`mktemp -d`
echo "Downloading solr bundle:"
curl http://archive.apache.org/dist/lucene/solr/${SOLR_VERSION}/solr-${SOLR_VERSION}.tgz > $GENERATE_SOLR_TMPDIR/solr-${SOLR_VERSION}.tgz
Expand Down