Skip to content
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
2 changes: 2 additions & 0 deletions .github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,11 @@ jobs:
- 'docker-compose*'
- 'backend/**'
- 'frontend/**'
- 'solr/**'
backend:
- 'backend/**'
- '.github/workflows/backend*'
- 'solr/**'
docs:
- '.readthedocs.yaml'
- 'docs/**'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- "backend/**"
- "docs/**"
- "frontend/**"
- "solr/**"
workflow_dispatch:

env:
Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/solr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,34 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Build amd64 image for smoke test
uses: docker/build-push-action@v3
with:
platforms: linux/amd64
context: solr
file: solr/Dockerfile
load: true
tags: kitconcept-solr-smoke:local

- name: Smoke test - plone core loads on startup
run: |
docker run -d --name solr-smoke -p 8983:8983 kitconcept-solr-smoke:local
# If the schema is broken the core fails to load, but Jetty still
# starts. /solr/plone/admin/ping returns 404 in that case.
for i in $(seq 1 60); do
if curl -fsS "http://localhost:8983/solr/plone/admin/ping?wt=json" 2>/dev/null | grep -q '"status":"OK"'; then
echo "Solr plone core loaded and healthy"
docker rm -f solr-smoke >/dev/null
exit 0
fi
sleep 2
done
echo "Solr plone core failed to come up healthy after 120s"
echo "--- container logs ---"
docker logs solr-smoke
docker rm -f solr-smoke >/dev/null
exit 1

- name: Login to Container Registry
uses: docker/login-action@v2
with:
Expand Down
1 change: 1 addition & 0 deletions news/+ciSolrSmokeAndAcceptance.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Run acceptance and backend tests on `solr/**` changes, and smoke-test the built Solr image (boot it and ping the `plone` core) before pushing it. @reebalazs
1 change: 1 addition & 0 deletions news/+fixDenseVectorFieldAttribute.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix `knn_vector_768` field type so the Solr core can load: use `hnswBeamWidth` instead of the unrecognized `hnswEfConstruction` attribute on `solr.DenseVectorField`. @reebalazs
2 changes: 1 addition & 1 deletion solr/etc/conf/schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@
class="solr.DenseVectorField"
vectorDimension="768"
similarityFunction="dot_product"
hnswEfConstruction="200"/>
hnswBeamWidth="200"/>

</types>

Expand Down
Loading