NGSTACK-805: cleanup

netgen · Nov 7, 2023 · ad3b4dc · ad3b4dc
1 parent 17a36bc
commit ad3b4dc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2,617 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -89,29 +89,25 @@ jobs:
                       engine: 'solr'
                       config: 'phpunit-integration-solr.xml'
                       solr_version: '8.11.2'
-                      solr_config: 'vendor/ibexa/solr/src/lib/Resources/config/solr/schema.xml vendor/ibexa/solr/src/lib/Resources/config/solr/language-fieldtypes.xml tests/lib/Resources/config/search/solr/8.11/solrconfig.xml tests/lib/Resources/config/search/solr/custom-fields-types.xml'
                       solr_cores: 'collection1'
                       core_setup: 'single'
                     - php: '8.1'
                       coverage: 'integration'
                       engine: 'solr'
                       config: 'phpunit-integration-solr.xml'
                       solr_version: '8.11.2'
-                      solr_config: 'vendor/ibexa/solr/src/lib/Resources/config/solr/schema.xml vendor/ibexa/solr/src/lib/Resources/config/solr/language-fieldtypes.xml tests/lib/Resources/config/search/solr/8.11/solrconfig.xml tests/lib/Resources/config/search/solr/custom-fields-types.xml'
                       core_setup: 'dedicated'
                     - php: '8.1'
                       coverage: 'integration'
                       engine: 'solr'
                       config: 'phpunit-integration-solr.xml'
                       solr_version: '8.11.2'
-                      solr_config: 'vendor/ibexa/solr/src/lib/Resources/config/solr/schema.xml vendor/ibexa/solr/src/lib/Resources/config/solr/language-fieldtypes.xml tests/lib/Resources/config/search/solr/8.11/solrconfig.xml tests/lib/Resources/config/search/solr/custom-fields-types.xml'
                       core_setup: 'shared'
                     - php: '8.1'
                       coverage: 'integration'
                       engine: 'solr'
                       config: 'phpunit-integration-solr.xml'
                       solr_version: '8.11.2'
-                      solr_config: 'vendor/ibexa/solr/src/lib/Resources/config/solr/schema.xml vendor/ibexa/solr/src/lib/Resources/config/solr/language-fieldtypes.xml tests/lib/Resources/config/search/solr/8.11/solrconfig.xml tests/lib/Resources/config/search/solr/custom-fields-types.xml'
                       solr_cloud: 'yes'
                       core_setup: 'cloud'
 
@@ -120,7 +116,6 @@ jobs:
                       engine: 'solr'
                       config: 'phpunit-core-integration-legacy-solr.xml'
                       solr_version: '8.11.2'
-                      solr_config: 'vendor/ibexa/solr/src/lib/Resources/config/solr/schema.xml vendor/ibexa/solr/src/lib/Resources/config/solr/language-fieldtypes.xml tests/lib/Resources/config/search/solr/8.11/solrconfig.xml tests/lib/Resources/config/search/solr/custom-fields-types.xml'
                       solr_cores: 'collection1'
                       core_setup: 'single'
                       regression: 'regression'
@@ -129,23 +124,20 @@ jobs:
                       engine: 'solr'
                       config: 'phpunit-core-integration-legacy-solr.xml'
                       solr_version: '8.11.2'
-                      solr_config: 'vendor/ibexa/solr/src/lib/Resources/config/solr/schema.xml vendor/ibexa/solr/src/lib/Resources/config/solr/language-fieldtypes.xml tests/lib/Resources/config/search/solr/8.11/solrconfig.xml tests/lib/Resources/config/search/solr/custom-fields-types.xml'
                       core_setup: 'dedicated'
                       regression: 'regression'
                     - php: '8.1'
                       coverage: 'integration'
                       engine: 'solr'
                       config: 'phpunit-core-integration-legacy-solr.xml'
                       solr_version: '8.11.2'
-                      solr_config: 'vendor/ibexa/solr/src/lib/Resources/config/solr/schema.xml vendor/ibexa/solr/src/lib/Resources/config/solr/language-fieldtypes.xml tests/lib/Resources/config/search/solr/8.11/solrconfig.xml tests/lib/Resources/config/search/solr/custom-fields-types.xml'
                       core_setup: 'shared'
                       regression: 'regression'
                     - php: '8.1'
                       coverage: 'integration'
                       engine: 'solr'
                       config: 'phpunit-core-integration-legacy-solr.xml'
                       solr_version: '8.11.2'
-                      solr_config: 'vendor/ibexa/solr/src/lib/Resources/config/solr/schema.xml vendor/ibexa/solr/src/lib/Resources/config/solr/language-fieldtypes.xml tests/lib/Resources/config/search/solr/8.11/solrconfig.xml tests/lib/Resources/config/search/solr/custom-fields-types.xml'
                       solr_cloud: 'yes'
                       core_setup: 'cloud'
                       regression: 'regression'

diff --git a/bin/init_solr.sh b/bin/init_solr.sh
@@ -1,8 +1,11 @@
 #!/usr/bin/env bash
 
+SOLR_VERSION=${SOLR_VERSION:-'8.11.2'}
+SOLR_VERSION_SHORT=${SOLR_VERSION%.*}
+
 default_config_files[1]='vendor/ibexa/solr/src/lib/Resources/config/solr/schema.xml'
 default_config_files[2]='vendor/ibexa/solr/src/lib/Resources/config/solr/language-fieldtypes.xml'
-default_config_files[3]='tests/lib/Resources/config/search/solr/7.7/solrconfig.xml'
+default_config_files[3]="tests/lib/Resources/config/search/solr/${SOLR_VERSION_SHORT}/solrconfig.xml"
 default_config_files[4]='tests/lib/Resources/config/search/solr/custom-fields-types.xml'
 
 default_cores[0]='core0'
@@ -17,7 +20,6 @@ default_shards=('shard0')
 
 SOLR_PORT=${SOLR_PORT:-8983}
 SOLR_DIR=${SOLR_DIR:-'__solr'}
-SOLR_VERSION=${SOLR_VERSION:-'7.7.3'}
 SOLR_INSTALL_DIR="${SOLR_DIR}/${SOLR_VERSION}"
 SOLR_DEBUG=${SOLR_DEBUG:-false}
 SOLR_HOME=${SOLR_HOME:-'ezcloud'}