mirror of
https://github.com/opencloud-eu/opencloud.git
synced 2026-04-26 05:58:27 -05:00
Integrate the s3ng storage driver
This commit is contained in:
André Duffeck
@@ -54,6 +54,10 @@ help:
|
||||
@echo -e "\tmake localApiTests-apiAccountsHashDifficulty-ocis\t\t${BLUE}run apiAccountsHashDifficulty test suite${RESET}"
|
||||
@echo -e "\tmake localApiTests-apiBugDemonstration-ocis\t\t${BLUE}run apiBugDemonstration test suite${RESET}"
|
||||
@echo
|
||||
@echo -e "${GREEN}Run full oCIS test suites against oCIS with s3ng storage:${RESET}\n"
|
||||
@echo -e "\tmake localApiTests-apiBasic-s3ng\t\t${BLUE}run apiBasic test suite${RESET}"
|
||||
@echo -e "\tmake localApiTests-apiOcisSpecific-s3ng\t\t${BLUE}run apiOcisSPecific test suite${RESET}"
|
||||
@echo
|
||||
@echo -e "${GREEN}Run full oCIS test suites against oCIS with ownCloud storage:${RESET}\n"
|
||||
@echo -e "\tmake localApiTests-apiAccountsHashDifficulty-owncloud\t\t${BLUE}run apiAccountsHashDifficulty test suite${RESET}"
|
||||
@echo -e "\tmake localApiTests-apiBugDemonstration-owncloud\t${BLUE}run apiBugDemonstration test suite${RESET}"
|
||||
@@ -61,6 +65,9 @@ help:
|
||||
@echo -e "${GREEN}Run full ownCloud test suites against oCIS with oCIS storage:${RESET}\n"
|
||||
@echo -e "\tmake Core-API-Tests-ocis-storage-${RED}X${RESET}\t\t${BLUE}run test suite number X, where ${RED}X = 1 .. 10${RESET}"
|
||||
@echo
|
||||
@echo -e "${GREEN}Run full ownCloud test suites against oCIS with s3ng storage:${RESET}\n"
|
||||
@echo -e "\tmake Core-API-Tests-s3ng-storage-${RED}X${RESET}\t\t${BLUE}run test suite number X, where ${RED}X = 1 .. 10${RESET}"
|
||||
@echo
|
||||
@echo -e "${GREEN}Run full ownCloud test suites against oCIS with ownCloud storage:${RESET}\n"
|
||||
@echo -e "\tmake Core-API-Tests-owncloud-storage-${RED}X${RESET}\t\t${BLUE}run test suite number X, where ${RED}X = 1 .. 10${RESET}"
|
||||
@echo
|
||||
@@ -70,6 +77,12 @@ help:
|
||||
@echo -e "\twhere ${YELLOW}BEHAT_FEATURE='...'${RESET} contains a relative path to the feature definition."
|
||||
@echo -e "\texample: ${RED}tests/acceptance/features/apiBugDemonstration/apiAuthOcs-ocsDELETEAuth.feature${RESET}"
|
||||
@echo
|
||||
@echo -e "${GREEN}Run an oCIS feature test against oCIS with s3ng storage:${RESET}\n"
|
||||
@echo -e "\tmake test-ocis-feature-s3ng-storage ${YELLOW}BEHAT_FEATURE='...'${RESET}\t${BLUE}run single feature test${RESET}"
|
||||
@echo
|
||||
@echo -e "\twhere ${YELLOW}BEHAT_FEATURE='...'${RESET} contains a relative path to the feature definition."
|
||||
@echo -e "\texample: ${RED}tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature${RESET}"
|
||||
@echo
|
||||
@echo -e "${GREEN}Run an oCIS feature test against oCIS with owncloud storage:${RESET}\n"
|
||||
@echo -e "\tmake test-ocis-feature-owncloud-storage ${YELLOW}BEHAT_FEATURE='...'${RESET}\t${BLUE}run single feature test${RESET}"
|
||||
@echo
|
||||
@@ -82,6 +95,12 @@ help:
|
||||
@echo -e "\twhere ${YELLOW}BEHAT_FEATURE='...'${RESET} contains a relative path to the feature definition."
|
||||
@echo -e "\texample: ${RED}tests/acceptance/features/apiAuth/cors.feature${RESET}"
|
||||
@echo
|
||||
@echo -e "${GREEN}Run an ownCloud feature test against oCIS with s3ng storage:${RESET}\n"
|
||||
@echo -e "\tmake test-oc10-feature-s3ng-storage ${YELLOW}BEHAT_FEATURE='...'${RESET}\t${BLUE}run single feature test${RESET}"
|
||||
@echo
|
||||
@echo -e "\twhere ${YELLOW}BEHAT_FEATURE='...'${RESET} contains a relative path to the feature definition."
|
||||
@echo -e "\texample: ${RED}tests/acceptance/features/apiAuth/cors.feature${RESET}"
|
||||
@echo
|
||||
@echo -e "${GREEN}Run an ownCloud feature test against oCIS with owncloud storage:${RESET}\n"
|
||||
@echo -e "\tmake test-oc10-feature-owncloud-storage ${YELLOW}BEHAT_FEATURE='...'${RESET}\t${BLUE}run single feature test${RESET}"
|
||||
@echo
|
||||
@@ -105,6 +124,14 @@ test-ocis-feature-ocis-storage: ## test a ocis feature with oCIS storage, useage
|
||||
BEHAT_FEATURE=$(BEHAT_FEATURE) \
|
||||
$(MAKE) --no-print-directory testSuite
|
||||
|
||||
.PHONY: test-ocis-feature-s3ng-storage
|
||||
test-ocis-feature-s3ng-storage: ## test a ocis feature with s3ng storage, useage: make ... BEHAT_FEATURE='tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature:7'
|
||||
@TEST_SOURCE=ocis \
|
||||
STORAGE=s3ng \
|
||||
BEHAT_FEATURE=$(BEHAT_FEATURE) \
|
||||
START_CEPH=1 \
|
||||
$(MAKE) --no-print-directory testSuite
|
||||
|
||||
.PHONY: test-ocis-feature-owncloud-storage
|
||||
test-ocis-feature-owncloud-storage: ## test a ocis feature with oc10 storage, useage: make ... BEHAT_FEATURE='tests/acceptance/features/apiBugDemonstration/apiAuthOcs-ocsDELETEAuth.feature:7'
|
||||
@TEST_SOURCE=ocis \
|
||||
@@ -119,6 +146,14 @@ test-oc10-feature-ocis-storage: ## test a oC10 feature with oCIS storage, useage
|
||||
BEHAT_FEATURE=$(BEHAT_FEATURE) \
|
||||
$(MAKE) --no-print-directory testSuite
|
||||
|
||||
.PHONY: test-oc10-feature-s3ng-storage
|
||||
test-oc10-feature-s3ng-storage: ## test a oC10 feature with s3ng storage, useage: make ... BEHAT_FEATURE='tests/acceptance/features/apiAuth/cors.feature'
|
||||
@TEST_SOURCE=oc10 \
|
||||
STORAGE=s3ng \
|
||||
BEHAT_FEATURE=$(BEHAT_FEATURE) \
|
||||
START_CEPH=1 \
|
||||
$(MAKE) --no-print-directory testSuite
|
||||
|
||||
.PHONY: test-oc10-feature-owncloud-storage
|
||||
test-oc10-feature-owncloud-storage: ## test a oC10 feature with oc10 storage, useage: make ... BEHAT_FEATURE='tests/acceptance/features/apiAuth/cors.feature'
|
||||
@TEST_SOURCE=oc10 \
|
||||
@@ -154,6 +189,23 @@ localApiTests-apiAccountsHashDifficulty-ocis: ## run apiAccountsHashDifficulty t
|
||||
BEHAT_SUITE=apiAccountsHashDifficulty \
|
||||
$(MAKE) --no-print-directory testSuite
|
||||
|
||||
.PHONY: localApiTests-apiOcisSpecific-s3ng
|
||||
localApiTests-apiOcisSpecific-s3ng: ## run apiOcisSPecific test suite with s3ng storage
|
||||
@TEST_SOURCE=ocis \
|
||||
STORAGE=s3ng \
|
||||
BEHAT_SUITE=apiOcisSpecific \
|
||||
START_CEPH=1 \
|
||||
$(MAKE) --no-print-directory testSuite
|
||||
|
||||
|
||||
.PHONY: localApiTests-apiBasic-s3ng
|
||||
localApiTests-apiBasic-s3ng: ## run apiBasic test suite with s3ng storage
|
||||
@TEST_SOURCE=ocis \
|
||||
STORAGE=s3ng \
|
||||
BEHAT_SUITE=apiBasic \
|
||||
START_CEPH=1 \
|
||||
$(MAKE) --no-print-directory testSuite
|
||||
|
||||
targets = $(addprefix Core-API-Tests-owncloud-storage-,$(PARTS))
|
||||
.PHONY: $(targets)
|
||||
$(targets):
|
||||
@@ -174,7 +226,12 @@ $(targets):
|
||||
|
||||
.PHONY: testSuite
|
||||
testSuite: clean-docker-container
|
||||
@COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
|
||||
@if [ -n "${START_CEPH}" ]; then \
|
||||
COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
|
||||
COMPOSE_FILE=src/ceph.yml \
|
||||
docker-compose run start_ceph; \
|
||||
fi; \
|
||||
COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
|
||||
COMPOSE_FILE=$(COMPOSE_FILE) \
|
||||
STORAGE=$(STORAGE) \
|
||||
TEST_SOURCE=$(TEST_SOURCE) \
|
||||
@@ -183,7 +240,7 @@ testSuite: clean-docker-container
|
||||
BEHAT_FEATURE=$(BEHAT_FEATURE) \
|
||||
DIVIDE_INTO_NUM_PARTS=$(DIVIDE_INTO_NUM_PARTS) \
|
||||
RUN_PART=$(RUN_PART) \
|
||||
docker-compose up -d --build --remove-orphans --force-recreate
|
||||
docker-compose up -d --build --force-recreate
|
||||
|
||||
.PHONY: show-test-logs
|
||||
show-test-logs: ## show logs of test
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
services:
|
||||
start_ceph:
|
||||
image: dadarek/wait-for-dependencies
|
||||
depends_on:
|
||||
- ceph
|
||||
command: ceph:5000
|
||||
ceph:
|
||||
image: ceph/daemon
|
||||
command: demo
|
||||
environment:
|
||||
MON_IP: 127.0.0.1
|
||||
CEPH_PUBLIC_NETWORK: 0.0.0.0/0
|
||||
CEPH_DEMO_UID: test-user
|
||||
CEPH_DEMO_ACCESS_KEY: test
|
||||
CEPH_DEMO_SECRET_KEY: test
|
||||
CEPH_DEMO_BUCKET: test
|
||||
RGW_NAME: ceph
|
||||
@@ -22,6 +22,12 @@ services:
|
||||
IDP_ISS: https://ocis-server:9200
|
||||
IDP_TLS: "true"
|
||||
ACCOUNTS_HASH_DIFFICULTY: 4
|
||||
# s3ng specific settings
|
||||
STORAGE_DRIVER_S3NG_ENDPOINT: http://ceph:8080
|
||||
STORAGE_DRIVER_S3NG_REGION: default
|
||||
STORAGE_DRIVER_S3NG_ACCESS_KEY: test
|
||||
STORAGE_DRIVER_S3NG_SECRET_KEY: test
|
||||
STORAGE_DRIVER_S3NG_BUCKET: test
|
||||
volumes:
|
||||
- ../../../config:/drone/src/ocis/tests/config
|
||||
- oCISownCloud10testsuite:/srv
|
||||
|
||||
@@ -62,6 +62,12 @@ then
|
||||
export DELETE_USER_DATA_CMD='rm -rf /srv/app/tmp/ocis/storage/users/nodes/root/* /srv/app/tmp/ocis/storage/users/nodes/*-*-*-*'
|
||||
export OCIS_REVA_DATA_ROOT=''
|
||||
export OCIS_SKELETON_STRATEGY='upload'
|
||||
elif [ "$STORAGE" = "s3ng" ]
|
||||
then
|
||||
export BEHAT_FILTER_TAGS='~@skipOnOcis-S3NG-Storage'
|
||||
export DELETE_USER_DATA_CMD='rm -rf /srv/app/tmp/ocis/storage/users/nodes/root/* /srv/app/tmp/ocis/storage/users/nodes/*-*-*-*'
|
||||
export OCIS_REVA_DATA_ROOT=''
|
||||
export OCIS_SKELETON_STRATEGY='upload'
|
||||
else
|
||||
echo "non existing storage selected"
|
||||
exit 1
|
||||
|
||||
Reference in New Issue
Block a user