use OC_ env prefix

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

tests/acceptance/docker/Makefile

@@ -19,16 +19,16 @@ COMPOSE_FILE ?= src/redis.yml:src/ocis-base.yml:src/acceptance.yml
 BEHAT_FEATURE ?=
 
 
-ifdef OCIS_IMAGE_TAG
+ifdef OC_IMAGE_TAG
 	BUILD_DEV_IMAGE := 0
 else
 	BUILD_DEV_IMAGE := 1
 endif
-OCIS_IMAGE_TAG ?= dev
+OC_IMAGE_TAG ?= dev
 
 # run tests with ociswrapper by default
 WITH_WRAPPER ?= true
-OCIS_WRAPPER := ../../ociswrapper/bin/ociswrapper
+OC_WRAPPER := ../../ociswrapper/bin/ociswrapper
 
 ifdef START_TIKA
 	ifeq ($(START_TIKA),true)
@@ -63,7 +63,7 @@ help:
 	@echo
 	@echo -e "The oCIS to be tested will be build from your current working state."
 	@echo -e "You also can select the oCIS Docker image for all tests by setting"
-	@echo -e "\tmake ... ${YELLOW}OCIS_IMAGE_TAG=latest${RESET}"
+	@echo -e "\tmake ... ${YELLOW}OC_IMAGE_TAG=latest${RESET}"
 	@echo -e "where ${YELLOW}latest${RESET} is an example for any valid Docker image tag from"
 	@echo -e "https://hub.docker.com/r/owncloud/ocis."
 	@echo
@@ -186,7 +186,7 @@ $(targets):
 	$(MAKE) --no-print-directory testSuite
 
 .PHONY: testSuite
-testSuite: $(OCIS_WRAPPER) build-dev-image clean-docker-container
+testSuite: $(OC_WRAPPER) build-dev-image clean-docker-container
 	@if [ -n "${START_CEPH}" ]; then \
 		COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
 		COMPOSE_FILE=src/ceph.yml \
@@ -212,11 +212,11 @@ testSuite: $(OCIS_WRAPPER) build-dev-image clean-docker-container
 	STORAGE_DRIVER=$(STORAGE_DRIVER) \
 	TEST_SOURCE=$(TEST_SOURCE) \
 	WITH_WRAPPER=$(WITH_WRAPPER) \
-	OCIS_ASYNC_UPLOADS=$(OCIS_ASYNC_UPLOADS) \
-	OCIS_ADD_RUN_SERVICES=$(OCIS_ADD_RUN_SERVICES) \
+	OC_ASYNC_UPLOADS=$(OC_ASYNC_UPLOADS) \
+	OC_ADD_RUN_SERVICES=$(OC_ADD_RUN_SERVICES) \
 	POSTPROCESSING_STEPS=$(POSTPROCESSING_STEPS) \
 	SEARCH_EXTRACTOR_TYPE=$(SEARCH_EXTRACTOR_TYPE) \
-	OCIS_IMAGE_TAG=$(OCIS_IMAGE_TAG) \
+	OC_IMAGE_TAG=$(OC_IMAGE_TAG) \
 	BEHAT_SUITE=$(BEHAT_SUITE) \
 	BEHAT_FEATURE=$(BEHAT_FEATURE) \
 	DIVIDE_INTO_NUM_PARTS=$(DIVIDE_INTO_NUM_PARTS) \
@@ -229,7 +229,7 @@ show-test-logs: ## show logs of test
 	COMPOSE_FILE=$(COMPOSE_FILE) \
 	docker-compose logs --no-log-prefix -f acceptance-tests | less
 
-$(OCIS_WRAPPER):
+$(OC_WRAPPER):
 	@if [ "$(WITH_WRAPPER)" == "true" ]; then \
 		$(MAKE) --no-print-directory -C ../../ociswrapper build \
 	; fi;
@@ -250,7 +250,7 @@ clean-docker-container: ## clean docker containers created during acceptance tes
 	COMPOSE_FILE=$(COMPOSE_FILE) \
 	BEHAT_SUITE="" \
 	DIVIDE_INTO_NUM_PARTS="" \
-	OCIS_IMAGE_TAG="" \
+	OC_IMAGE_TAG="" \
 	RUN_PART="" \
 	STORAGE_DRIVER="" \
 	TEST_SOURCE="" \
@@ -262,7 +262,7 @@ clean-docker-volumes: ## clean docker volumes created during acceptance tests
 	COMPOSE_FILE=$(COMPOSE_FILE) \
 	BEHAT_SUITE="" \
 	DIVIDE_INTO_NUM_PARTS="" \
-	OCIS_IMAGE_TAG="" \
+	OC_IMAGE_TAG="" \
 	RUN_PART="" \
 	STORAGE_DRIVER="" \
 	TEST_SOURCE="" \

tests/acceptance/docker/src/acceptance.yml

@@ -4,9 +4,9 @@ services:
     working_dir: /drone/src
     command: /bin/bash /test/run-tests.sh
     environment:
-      OCIS_ROOT: /drone/src
+      OC_ROOT: /drone/src
       TEST_SERVER_URL: https://ocis-server:9200
-      OCIS_WRAPPER_URL: http://ocis-server:5200
+      OC_WRAPPER_URL: http://ocis-server:5200
       STORAGE_DRIVER: $STORAGE_DRIVER
       TEST_SOURCE: $TEST_SOURCE
       BEHAT_SUITE: ${BEHAT_SUITE:-}

tests/acceptance/docker/src/ocis-base.yml

@@ -4,25 +4,25 @@ services:
       dockerfile: ocis.Dockerfile
       context: ./
       args:
-        OCIS_IMAGE_TAG: $OCIS_IMAGE_TAG
+        OC_IMAGE_TAG: $OC_IMAGE_TAG
     user: root
     environment:
       WITH_WRAPPER: $WITH_WRAPPER
-      OCIS_URL: "https://ocis-server:9200"
+      OC_URL: "https://ocis-server:9200"
       STORAGE_USERS_DRIVER: $STORAGE_DRIVER
       STORAGE_USERS_DRIVER_LOCAL_ROOT: /srv/app/tmp/ocis/local/root
-      STORAGE_USERS_DRIVER_OCIS_ROOT: /srv/app/tmp/ocis/storage/users
-      STORAGE_SYSTEM_DRIVER_OCIS_ROOT: /srv/app/tmp/ocis/storage/metadata
+      STORAGE_USERS_DRIVER_OC_ROOT: /srv/app/tmp/ocis/storage/users
+      STORAGE_SYSTEM_DRIVER_OC_ROOT: /srv/app/tmp/ocis/storage/metadata
       SHARING_USER_JSON_FILE: /srv/app/tmp/ocis/shares.json
       PROXY_ENABLE_BASIC_AUTH: "true"
       WEB_UI_CONFIG_FILE: /drone/src/tests/config/drone/ocis-config.json
       ACCOUNTS_HASH_DIFFICULTY: 4
-      OCIS_INSECURE: "true"
+      OC_INSECURE: "true"
       IDM_CREATE_DEMO_USERS: "true"
       IDM_ADMIN_PASSWORD: "admin"
       FRONTEND_SEARCH_MIN_LENGTH: "2"
-      OCIS_ASYNC_UPLOADS: $OCIS_ASYNC_UPLOADS
-      OCIS_ADD_RUN_SERVICES: $OCIS_ADD_RUN_SERVICES
+      OC_ASYNC_UPLOADS: $OC_ASYNC_UPLOADS
+      OC_ADD_RUN_SERVICES: $OC_ADD_RUN_SERVICES
 
       # s3ng specific settings
       STORAGE_USERS_S3NG_ENDPOINT: http://ceph:8080

tests/acceptance/docker/src/ocis.Dockerfile

@@ -1,8 +1,8 @@
 # custom Dockerfile required to run ociswrapper command
 # mounting 'ociswrapper' binary doesn't work with image 'amd64/alpine:3.17' (busybox based)
 
-ARG OCIS_IMAGE_TAG
-FROM owncloud/ocis:${OCIS_IMAGE_TAG} as ocis
+ARG OC_IMAGE_TAG
+FROM owncloud/ocis:${OC_IMAGE_TAG} as ocis
 
 FROM ubuntu:22.04
 COPY --from=ocis /usr/bin/ocis /usr/bin/ocis

tests/acceptance/docker/src/run-tests.sh

@@ -10,12 +10,12 @@ git config --global advice.detachedHead false
 if [ "$TEST_SOURCE" = "oc10" ]; then
     export ACCEPTANCE_TEST_TYPE='core-api'
     if [ "$STORAGE_DRIVER" = "ocis" ]; then
-        export OCIS_REVA_DATA_ROOT=''
+        export OC_REVA_DATA_ROOT=''
         export BEHAT_FILTER_TAGS='~@skipOnOcis-OCIS-Storage'
         export EXPECTED_FAILURES_FILE='/drone/src/tests/acceptance/expected-failures-API-on-OCIS-storage.md'
     elif [ "$STORAGE_DRIVER" = "s3ng" ]; then
         export BEHAT_FILTER_TAGS='~@skip&&~@skipOnOcis-S3NG-Storage'
-        export OCIS_REVA_DATA_ROOT=''
+        export OC_REVA_DATA_ROOT=''
     else
         echo "non existing STORAGE selected"
         exit 1
@@ -26,10 +26,10 @@ if [ "$TEST_SOURCE" = "oc10" ]; then
 elif [ "$TEST_SOURCE" = "ocis" ]; then
     if [ "$STORAGE_DRIVER" = "ocis" ]; then
         export BEHAT_FILTER_TAGS='~@skip&&~@skipOnOcis-OCIS-Storage'
-        export OCIS_REVA_DATA_ROOT=''
+        export OC_REVA_DATA_ROOT=''
     elif [ "$STORAGE_DRIVER" = "s3ng" ]; then
         export BEHAT_FILTER_TAGS='~@skip&&~@skipOnOcis-S3NG-Storage'
-        export OCIS_REVA_DATA_ROOT=''
+        export OC_REVA_DATA_ROOT=''
     else
         echo "non existing storage selected"
         exit 1
@@ -61,7 +61,7 @@ if [[ -z "$TEST_SOURCE" ]]; then
     exit 1
 else
     sleep 10
-    make -C $OCIS_ROOT test-acceptance-api
+    make -C $OC_ROOT test-acceptance-api
 fi
 
 chmod -R 777 vendor-bin/**/vendor vendor-bin/**/composer.lock tests/acceptance/output