Merge branch 'master' into feature/pacman-runtime

This commit is contained in:
A.Unger
2020-05-25 11:18:31 +02:00

View File

@@ -143,6 +143,7 @@ def testing(ctx):
'REVA_STORAGE_OC_DATA_TEMP_FOLDER': '/srv/app/tmp/',
'REVA_STORAGE_OWNCLOUD_REDIS_ADDR': 'redis:6379',
'REVA_OIDC_ISSUER': 'https://ocis-server:9200',
'REVA_STORAGE_OC_DATA_SERVER_URL': 'http://ocis-server:9164/data',
'PHOENIX_WEB_CONFIG': '/drone/src/tests/config/drone/ocis-config.json',
'PHOENIX_ASSET_PATH': '/srv/app/phoenix/dist',
'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/tests/config/drone/identifier-registration.yml',
@@ -198,7 +199,7 @@ def testing(ctx):
'RUN_ON_OCIS': 'true',
'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/reva',
'OCIS_SKELETON_DIR': '/srv/app/testing/data/webUISkeleton',
'OCIS_PHOENIX_CONFIG': '/drone/src/tests/config/drone/ocis-config.json',
'PHOENIX_CONFIG': '/drone/src/tests/config/drone/ocis-config.json',
'LDAP_SERVER_URL': 'ldap://ldap',
'TEST_TAGS': 'not @skipOnOCIS and not @skip',
'LOCAL_UPLOAD_DIR': '/uploads'