rebranding tests
This commit is contained in:
Viktor Scharf
@@ -5,8 +5,8 @@ services:
|
||||
command: /bin/bash /test/run-tests.sh
|
||||
environment:
|
||||
OC_ROOT: /drone/src
|
||||
TEST_SERVER_URL: https://ocis-server:9200
|
||||
OC_WRAPPER_URL: http://ocis-server:5200
|
||||
TEST_SERVER_URL: https://opencloud-server:9200
|
||||
OC_WRAPPER_URL: http://opencloud-server:5200
|
||||
STORAGE_DRIVER: $STORAGE_DRIVER
|
||||
TEST_SOURCE: $TEST_SOURCE
|
||||
BEHAT_SUITE: ${BEHAT_SUITE:-}
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
# custom Dockerfile required to run ociswrapper command
|
||||
# mounting 'ociswrapper' binary doesn't work with image 'amd64/alpine:3.17' (busybox based)
|
||||
|
||||
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
|
||||
|
||||
COPY ["./serve-ocis.sh", "/usr/bin/serve-ocis"]
|
||||
RUN chmod +x /usr/bin/serve-ocis
|
||||
|
||||
ENTRYPOINT [ "serve-ocis" ]
|
||||
+10
-10
@@ -1,21 +1,21 @@
|
||||
services:
|
||||
ocis-server:
|
||||
opencloud-server:
|
||||
build:
|
||||
dockerfile: ocis.Dockerfile
|
||||
dockerfile: opencloud.Dockerfile
|
||||
context: ./
|
||||
args:
|
||||
OC_IMAGE_TAG: $OC_IMAGE_TAG
|
||||
user: root
|
||||
environment:
|
||||
WITH_WRAPPER: $WITH_WRAPPER
|
||||
OC_URL: "https://ocis-server:9200"
|
||||
OC_URL: "https://opencloud-server:9200"
|
||||
STORAGE_USERS_DRIVER: $STORAGE_DRIVER
|
||||
STORAGE_USERS_DRIVER_LOCAL_ROOT: /srv/app/tmp/ocis/local/root
|
||||
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
|
||||
STORAGE_USERS_DRIVER_LOCAL_ROOT: /srv/app/tmp/opencloud/local/root
|
||||
STORAGE_USERS_DRIVER_OC_ROOT: /srv/app/tmp/opencloud/storage/users
|
||||
STORAGE_SYSTEM_DRIVER_OC_ROOT: /srv/app/tmp/opencloud/storage/metadata
|
||||
SHARING_USER_JSON_FILE: /srv/app/tmp/opencloud/shares.json
|
||||
PROXY_ENABLE_BASIC_AUTH: "true"
|
||||
WEB_UI_CONFIG_FILE: /drone/src/tests/config/drone/ocis-config.json
|
||||
WEB_UI_CONFIG_FILE: /drone/src/tests/config/drone/opencloud-config.json
|
||||
ACCOUNTS_HASH_DIFFICULTY: 4
|
||||
OC_INSECURE: "true"
|
||||
IDM_CREATE_DEMO_USERS: "true"
|
||||
@@ -34,7 +34,7 @@ services:
|
||||
NOTIFICATIONS_SMTP_HOST: email
|
||||
NOTIFICATIONS_SMTP_PORT: 2500
|
||||
NOTIFICATIONS_SMTP_INSECURE: "true"
|
||||
NOTIFICATIONS_SMTP_SENDER: "owncloud <noreply@example.com>"
|
||||
NOTIFICATIONS_SMTP_SENDER: "opencloud <noreply@example.com>"
|
||||
|
||||
# antivirus
|
||||
ANTIVIRUS_SCANNER_TYPE: "clamav"
|
||||
@@ -52,4 +52,4 @@ services:
|
||||
THUMBNAILS_TXT_FONTMAP_FILE: "/drone/src/tests/config/drone/fontsMap.json"
|
||||
volumes:
|
||||
- ../../../config:/drone/src/tests/config
|
||||
- ../../../ociswrapper/bin/ociswrapper:/usr/bin/ociswrapper
|
||||
- ../../../ocwrapper/bin/ocwrapper:/usr/bin/ocwrapper
|
||||
@@ -0,0 +1,13 @@
|
||||
# custom Dockerfile required to run ocwrapper command
|
||||
# mounting 'ocwrapper' binary doesn't work with image 'amd64/alpine:3.17' (busybox based)
|
||||
|
||||
ARG OC_IMAGE_TAG
|
||||
FROM opencloud-eu/opencloud:${OC_IMAGE_TAG} as opencloud
|
||||
|
||||
FROM ubuntu:22.04
|
||||
COPY --from=opencloud /usr/bin/opencloud /usr/bin/opencloud
|
||||
|
||||
COPY ["./serve-opencloud.sh", "/usr/bin/serve-opencloud"]
|
||||
RUN chmod +x /usr/bin/serve-opencloud
|
||||
|
||||
ENTRYPOINT [ "serve-opencloud" ]
|
||||
@@ -7,14 +7,14 @@ git config --global advice.detachedHead false
|
||||
|
||||
## CONFIGURE TEST
|
||||
|
||||
if [ "$TEST_SOURCE" = "oc10" ]; then
|
||||
if [ "$TEST_SOURCE" = "core" ]; then
|
||||
export ACCEPTANCE_TEST_TYPE='core-api'
|
||||
if [ "$STORAGE_DRIVER" = "ocis" ]; then
|
||||
export OC_REVA_DATA_ROOT=''
|
||||
export BEHAT_FILTER_TAGS='~@skipOnOcis-OCIS-Storage'
|
||||
export BEHAT_FILTER_TAGS='~@skipOnOpencloud-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 BEHAT_FILTER_TAGS='~@skip&&~@skipOnOpencloud-S3NG-Storage'
|
||||
export OC_REVA_DATA_ROOT=''
|
||||
else
|
||||
echo "non existing STORAGE selected"
|
||||
@@ -23,12 +23,12 @@ if [ "$TEST_SOURCE" = "oc10" ]; then
|
||||
|
||||
unset BEHAT_SUITE
|
||||
|
||||
elif [ "$TEST_SOURCE" = "ocis" ]; then
|
||||
elif [ "$TEST_SOURCE" = "opencloud" ]; then
|
||||
if [ "$STORAGE_DRIVER" = "ocis" ]; then
|
||||
export BEHAT_FILTER_TAGS='~@skip&&~@skipOnOcis-OCIS-Storage'
|
||||
export BEHAT_FILTER_TAGS='~@skip&&~@skipOnOpencloud-OCIS-Storage'
|
||||
export OC_REVA_DATA_ROOT=''
|
||||
elif [ "$STORAGE_DRIVER" = "s3ng" ]; then
|
||||
export BEHAT_FILTER_TAGS='~@skip&&~@skipOnOcis-S3NG-Storage'
|
||||
export BEHAT_FILTER_TAGS='~@skip&&~@skipOnOpencloud-S3NG-Storage'
|
||||
export OC_REVA_DATA_ROOT=''
|
||||
else
|
||||
echo "non existing storage selected"
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
# init ocis
|
||||
ocis init
|
||||
|
||||
if [ "$WITH_WRAPPER" = "true" ]; then
|
||||
ociswrapper serve --bin=ocis
|
||||
else
|
||||
ocis server
|
||||
fi
|
||||
@@ -0,0 +1,11 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
# init OpenCloud
|
||||
opencloud init
|
||||
|
||||
if [ "$WITH_WRAPPER" = "true" ]; then
|
||||
ocwrapper serve --bin=opencloud
|
||||
else
|
||||
oc server
|
||||
fi
|
||||
Reference in New Issue
Block a user