Change Solr core name for Koppie

samvera · Jan 25, 2024 · 7b9dd81 · 7b9dd81
1 parent e33aae6
commit 7b9dd81
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.koppie/.env b/.koppie/.env
@@ -43,6 +43,6 @@ SOLR_CORES=koppie
 SOLR_HOST=solr
 SOLR_PORT=8983
 SOLR_URL=http://solr:8983/solr/koppie
-SOLR_TEST_URL=http://solr:8983/solr/koppie_test
+SOLR_TEST_URL=http://solr:8983/solr/hydra-test
 VALKYRIE_METADATA_ADAPTER=pg_metadata
-VALKYRIE_STORAGE_ADAPTER=versioned_disk_storage
+VALKYRIE_STORAGE_ADAPTER=versioned_disk_storage
diff --git a/docker-compose-koppie.yml b/docker-compose-koppie.yml
@@ -145,7 +145,7 @@ services:
     command:
       - sh
       - "-c"
-      - "precreate-core koppie_test /opt/solr/server/configsets/hyraxconf; solr-precreate koppie /opt/solr/server/configsets/hyraxconf"
+      - "precreate-core hydra-test /opt/solr/server/configsets/hyraxconf; solr-precreate koppie /opt/solr/server/configsets/hyraxconf"
     volumes:
       - solr_home:/var/solr/data:cached
       - .koppie/solr/conf:/opt/solr/server/configsets/hyraxconf

diff --git a/docker-compose-sirenia.yml b/docker-compose-sirenia.yml
@@ -129,8 +129,8 @@ services:
     image: fcrepo/fcrepo:6.4.0
     environment:
       - >-
-        CATALINA_OPTS=-Dfcrepo.home=/fcrepo-home -Djava.awt.headless=true -Dfile.encoding=UTF-8 
-        -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m 
+        CATALINA_OPTS=-Dfcrepo.home=/fcrepo-home -Djava.awt.headless=true -Dfile.encoding=UTF-8
+        -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m
         -XX:MaxPermSize=256m -XX:+DisableExplicitGC -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true
       - JAVA_OPTS=-Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true
     volumes:
@@ -170,7 +170,7 @@ services:
     command:
       - sh
       - "-c"
-      - "precreate-core koppie_test /opt/solr/server/configsets/hyraxconf; solr-precreate koppie /opt/solr/server/configsets/hyraxconf"
+      - "precreate-core hydra-test /opt/solr/server/configsets/hyraxconf; solr-precreate koppie /opt/solr/server/configsets/hyraxconf"
     volumes:
       - solr_home:/var/solr/data:cached
       - .koppie/solr/conf:/opt/solr/server/configsets/hyraxconf

diff --git a/spec/valkyrie/indexing/solr/indexing_adapter_spec.rb b/spec/valkyrie/indexing/solr/indexing_adapter_spec.rb
@@ -8,7 +8,7 @@
   let(:metadata_adapter) { Wings::Valkyrie::MetadataAdapter.new }
   let(:resource) { FactoryBot.valkyrie_create(:hyrax_resource) }
   let(:resource2) { FactoryBot.valkyrie_create(:hyrax_resource) }
-  let(:expected_solr_core) { Hyrax.config.disable_wings ? 'koppie_test' : 'valkyrie-test' }
+  let(:expected_solr_core) { Hyrax.config.disable_wings ? 'hydra-test' : 'valkyrie-test' }
 
   describe "#connection" do
     it "returns connection" do