use lucene-solr checkout (solariumphp#835)

use lucene-solr checkout as source for XML files to upload and to be able to patch/extend solrconfig.xml of the techproducts example according to our needs.

.github/workflows/run-tests.yml

@@ -37,9 +37,28 @@ jobs:
             - name: Checkout solarium
               uses: actions/checkout@v2
 
+            - name: Checkout solr 7.7
+              if: matrix.solr == 7
+              uses: actions/checkout@v2
+              with:
+                repository: apache/lucene-solr
+                ref: branch_7_7
+                path: lucene-solr
+
+            - name: Checkout solr 8.5
+              if: matrix.solr == 8
+              uses: actions/checkout@v2
+              with:
+                repository: apache/lucene-solr
+                ref: branch_8_5
+                path: lucene-solr
+
             - name: Start Solr ${{ matrix.solr }} in ${{ matrix.mode }} mode
               run: |
-                cd tests/Integration/Fixtures/docker/solr${{ matrix.solr }}_${{ matrix.mode }}
+                chmod -R a+w lucene-solr
+                cd lucene-solr
+                patch -p1 < ../tests/Integration/Fixtures/solrconf.patch
+                cd ../tests/Integration/Fixtures/docker/solr${{ matrix.solr }}_${{ matrix.mode }}
                 docker-compose up -d
 
             - name: Install dependencies

.gitignore

@@ -1,5 +1,6 @@
 /build
 /composer.lock
+/lucene-solr
 /vendor
 .idea
 /.phpunit.result.cache

examples/execute_all.php

@@ -64,7 +64,13 @@
     $client->execute($query);
 
     // index techproducts sample data
-    foreach (glob(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'tests'.DIRECTORY_SEPARATOR.'Integration'.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'techproducts'.DIRECTORY_SEPARATOR.'*.xml') as $file) {
+    $dataDir = __DIR__.
+        DIRECTORY_SEPARATOR.'..'.
+        DIRECTORY_SEPARATOR.'lucene-solr'.
+        DIRECTORY_SEPARATOR.'solr'.
+        DIRECTORY_SEPARATOR.'example'.
+        DIRECTORY_SEPARATOR.'exampledocs';
+    foreach (glob($dataDir.DIRECTORY_SEPARATOR.'*.xml') as $file) {
         $update = $client->createUpdate();
 
         if (null !== $encoding = Utility::getXmlEncoding($file)) {

tests/Integration/AbstractServerTest.php

@@ -26,7 +26,7 @@ protected static function createTechproducts(): void
         // create core with unique name using the techproducts configset
         $createAction = $coreAdminQuery->createCreate();
         $createAction->setCore(self::$name)
-            ->setConfigSet('sample_techproducts_configs');
+            ->setConfigSet('solarium');
         $coreAdminQuery->setAction($createAction);
         $response = self::$client->coreAdmin($coreAdminQuery);
         static::assertTrue($response->getWasSuccessful());

tests/Integration/AbstractTechproductsTest.php

@@ -97,7 +97,14 @@ public static function setUpBeforeClass(): void
 
         try {
             // index techproducts sample data
-            foreach (glob(__DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'techproducts'.DIRECTORY_SEPARATOR.'*.xml') as $file) {
+            $dataDir = __DIR__.
+                DIRECTORY_SEPARATOR.'..'.
+                DIRECTORY_SEPARATOR.'..'.
+                DIRECTORY_SEPARATOR.'lucene-solr'.
+                DIRECTORY_SEPARATOR.'solr'.
+                DIRECTORY_SEPARATOR.'example'.
+                DIRECTORY_SEPARATOR.'exampledocs';
+            foreach (glob($dataDir.DIRECTORY_SEPARATOR.'*.xml') as $file) {
                 $update = self::$client->createUpdate();
 
                 if (null !== $encoding = Utility::getXmlEncoding($file)) {

tests/Integration/Fixtures/docker/solr7_cloud/docker-compose.yml

@@ -4,4 +4,6 @@ services:
     image: solr:7
     ports:
       - "8983:8983"
-    command: bash -c "docker-entrypoint.sh solr start -c; solr zk upconfig -z localhost:9983 -n techproducts -d server/solr/configsets/sample_techproducts_configs/conf; mkdir /opt/solr/server/solr/data2; cp /opt/solr/server/solr/solr.xml /opt/solr/server/solr/data2; solr start -c -s /opt/solr/server/solr/data2 -p 8987 -z localhost:9983 -f"
+    volumes:
+      - ../../../../../lucene-solr/solr/server/solr/configsets/sample_techproducts_configs/conf:/opt/solr/server/solr/configsets/solarium/conf
+    command: bash -c "docker-entrypoint.sh solr start -c; solr zk upconfig -z localhost:9983 -n techproducts -d server/solr/configsets/solarium/conf; mkdir /opt/solr/server/solr/data2; cp /opt/solr/server/solr/solr.xml /opt/solr/server/solr/data2; solr start -c -s /opt/solr/server/solr/data2 -p 8987 -z localhost:9983 -f"

tests/Integration/Fixtures/docker/solr7_server/docker-compose.yml

@@ -4,4 +4,6 @@ services:
     image: solr:7
     ports:
       - "8983:8983"
-    command: bash -c "cp -R /opt/solr/server/solr/configsets /var/solr/data/configsets; docker-entrypoint.sh solr start -f"
+    volumes:
+      - ../../../../../lucene-solr/solr/server/solr/configsets/sample_techproducts_configs/conf:/opt/solr/server/solr/configsets/solarium/conf
+    command: bash -c "chown -R solr.solr /opt/solr/server/solr/configsets/solarium; cp -R /opt/solr/server/solr/configsets /var/solr/data/configsets; docker-entrypoint.sh solr start -f"

tests/Integration/Fixtures/docker/solr8_cloud/docker-compose.yml

@@ -1,7 +1,9 @@
 version: '3'
 services:
   solr8:
-    image: solr:8
+    image: solr:8.5
     ports:
       - "8983:8983"
-    command: bash -c "docker-entrypoint.sh solr start -c; solr zk upconfig -z localhost:9983 -n techproducts -d server/solr/configsets/sample_techproducts_configs/conf; mkdir /var/solr/data2; cp /var/solr/data/solr.xml /var/solr/data2/; solr start -c -s /var/solr/data2 -p 8987 -z localhost:9983 -f"
+    volumes:
+      - ../../../../../lucene-solr/solr/server/solr/configsets/sample_techproducts_configs/conf:/opt/solr/server/solr/configsets/solarium/conf
+    command: bash -c "docker-entrypoint.sh solr start -c; solr zk upconfig -z localhost:9983 -n techproducts -d server/solr/configsets/solarium/conf; mkdir /var/solr/data2; cp /var/solr/data/solr.xml /var/solr/data2/; solr start -c -s /var/solr/data2 -p 8987 -z localhost:9983 -f"

tests/Integration/Fixtures/docker/solr8_server/docker-compose.yml

@@ -1,7 +1,9 @@
 version: '3'
 services:
   solr8:
-    image: solr:8
+    image: solr:8.5
     ports:
       - "8983:8983"
-    command: bash -c "cp -R /opt/solr/server/solr/configsets /var/solr/data/configsets; docker-entrypoint.sh solr start -f"
+    volumes:
+      - ../../../../../lucene-solr/solr/server/solr/configsets/sample_techproducts_configs/conf:/opt/solr/server/solr/configsets/solarium/conf
+    command: bash -c "chown -R solr.solr /opt/solr/server/solr/configsets/solarium; cp -R /opt/solr/server/solr/configsets /var/solr/data/configsets; docker-entrypoint.sh solr start -f"

tests/Integration/Fixtures/solrconf.patch

@@ -0,0 +1,13 @@
+diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
+index 59f5eb7b448..c9ffe37a4bb 100644
+--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
++++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
+@@ -86,6 +86,8 @@
+   <lib dir="${solr.install.dir:../../../..}/contrib/velocity/lib" regex=".*\.jar" />
+   <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-velocity-\d.*\.jar" />
+
++  <lib dir="${solr.install.dir:../../../..}/dist"/>
++
+   <!-- an exact 'path' can be used instead of a 'dir' to specify a
+        specific jar file.  This will cause a serious error to be logged
+        if it can't be loaded.