Make tika service run only for tika

owncloud · Sep 25, 2023 · fa71fcb · fa71fcb
1 parent 2725719
commit fa71fcb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/tests/acceptance/docker/Makefile b/tests/acceptance/docker/Makefile
@@ -30,6 +30,17 @@ OCIS_IMAGE_TAG ?= dev
 WITH_WRAPPER ?= true
 OCIS_WRAPPER := ../../ociswrapper/bin/ociswrapper
 
+ifdef START_TIKA
+	ifeq ($(START_TIKA),true)
+		COMPOSE_FILE := $(COMPOSE_FILE):src/tika.yml
+		SEARCH_EXTRACTOR_TYPE := tika
+	else
+		SEARCH_EXTRACTOR_TYPE := basic
+	endif
+else
+	SEARCH_EXTRACTOR_TYPE := basic
+endif
+
 # static
 DIVIDE_INTO_NUM_PARTS := 10
 PARTS = 1 2 3 4 5 6 7 8 9 10
@@ -204,6 +215,7 @@ testSuite: $(OCIS_WRAPPER) build-dev-image clean-docker-container
 	OCIS_ASYNC_UPLOADS=$(OCIS_ASYNC_UPLOADS) \
 	OCIS_ADD_RUN_SERVICES=$(OCIS_ADD_RUN_SERVICES) \
 	POSTPROCESSING_STEPS=$(POSTPROCESSING_STEPS) \
+	SEARCH_EXTRACTOR_TYPE=$(SEARCH_EXTRACTOR_TYPE) \
 	OCIS_IMAGE_TAG=$(OCIS_IMAGE_TAG) \
 	BEHAT_SUITE=$(BEHAT_SUITE) \
 	BEHAT_FEATURE=$(BEHAT_FEATURE) \

diff --git a/tests/acceptance/docker/src/ocis-base.yml b/tests/acceptance/docker/src/ocis-base.yml
@@ -44,7 +44,7 @@ services:
       POSTPROCESSING_STEPS: $POSTPROCESSING_STEPS
 
       # tika
-      SEARCH_EXTRACTOR_TYPE: "tika"
+      SEARCH_EXTRACTOR_TYPE: $SEARCH_EXTRACTOR_TYPE
       SEARCH_EXTRACTOR_TIKA_TIKA_URL: "http://tika:9998"
       SEARCH_EXTRACTOR_CS3SOURCE_INSECURE: "true"