From bff98781313b1c20ae2e19c2c0160f552d5ca552 Mon Sep 17 00:00:00 2001 From: David Christofas Date: Wed, 4 Nov 2020 10:28:22 +0100 Subject: [PATCH] update reva Signed-off-by: David Christofas --- .drone.star | 8 ++++---- ocis/go.mod | 1 + ocis/go.sum | 3 +++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.drone.star b/.drone.star index 77ee1e9d210..1e5c70d48b4 100644 --- a/.drone.star +++ b/.drone.star @@ -356,7 +356,7 @@ def localApiTests(ctx, coreBranch = 'master', coreCommit = '', storage = 'ownclo 'pull': 'always', 'environment' : { 'TEST_SERVER_URL': 'https://ocis-server:9200', - #'OCIS_REVA_DATA_ROOT': '%s' % ('/srv/app/tmp/ocis/owncloud/data/' if storage == 'owncloud' else ''), + 'OCIS_REVA_DATA_ROOT': '%s' % ('/srv/app/tmp/ocis/owncloud/data/' if storage == 'owncloud' else ''), 'DELETE_USER_DATA_CMD': '%s' % ('' if storage == 'owncloud' else 'rm -rf /srv/app/tmp/ocis/storage/users/nodes/root/* /srv/app/tmp/ocis/storage/users/nodes/*-*-*-*'), 'SKELETON_DIR': '/srv/app/tmp/testing/data/apiSkeleton', 'OCIS_SKELETON_STRATEGY': '%s' % ('copy' if storage == 'owncloud' else 'upload'), @@ -411,7 +411,7 @@ def coreApiTests(ctx, coreBranch = 'master', coreCommit = '', part_number = 1, n 'pull': 'always', 'environment' : { 'TEST_SERVER_URL': 'https://ocis-server:9200', - #'OCIS_REVA_DATA_ROOT': '%s' % ('/srv/app/tmp/ocis/owncloud/data/' if storage == 'owncloud' else ''), + 'OCIS_REVA_DATA_ROOT': '%s' % ('/srv/app/tmp/ocis/owncloud/data/' if storage == 'owncloud' else ''), 'DELETE_USER_DATA_CMD': '%s' % ('' if storage == 'owncloud' else 'rm -rf /srv/app/tmp/ocis/storage/users/nodes/root/* /srv/app/tmp/ocis/storage/users/nodes/*-*-*-*'), 'SKELETON_DIR': '/srv/app/tmp/testing/data/apiSkeleton', 'OCIS_SKELETON_STRATEGY': '%s' % ('copy' if storage == 'owncloud' else 'upload'), @@ -478,7 +478,7 @@ def uiTestPipeline(suiteName, phoenixBranch = 'master', phoenixCommit = '', stor 'SERVER_HOST': 'https://ocis-server:9200', 'BACKEND_HOST': 'https://ocis-server:9200', 'RUN_ON_OCIS': 'true', - #'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/ocis/owncloud/data', + 'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/ocis/owncloud/data', 'OCIS_SKELETON_DIR': '/srv/app/testing/data/webUISkeleton', 'PHOENIX_CONFIG': '/drone/src/ocis/tests/config/drone/ocis-config.json', 'TEST_TAGS': 'not @skipOnOCIS and not @skip', @@ -550,7 +550,7 @@ def accountsUITests(ctx, phoenixBranch, phoenixCommit, storage = 'owncloud'): 'SERVER_HOST': 'https://ocis-server:9200', 'BACKEND_HOST': 'https://ocis-server:9200', 'RUN_ON_OCIS': 'true', - #'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/ocis/owncloud/data', + 'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/ocis/owncloud/data', 'OCIS_SKELETON_DIR': '/srv/app/testing/data/webUISkeleton', 'PHOENIX_CONFIG': '/drone/src/ocis/tests/config/drone/ocis-config.json', 'TEST_TAGS': 'not @skipOnOCIS and not @skip', diff --git a/ocis/go.mod b/ocis/go.mod index e9d6b290120..2be7c3e8551 100644 --- a/ocis/go.mod +++ b/ocis/go.mod @@ -7,6 +7,7 @@ require ( contrib.go.opencensus.io/exporter/ocagent v0.7.0 contrib.go.opencensus.io/exporter/zipkin v0.1.2 github.com/UnnoTed/fileb0x v1.1.4 + github.com/cs3org/reva v1.3.1-0.20201104092030-4a28e84e33e4 // indirect github.com/go-test/deep v1.0.6 // indirect github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect github.com/micro/cli/v2 v2.1.2 diff --git a/ocis/go.sum b/ocis/go.sum index c332f972827..778ed23a6da 100644 --- a/ocis/go.sum +++ b/ocis/go.sum @@ -124,6 +124,7 @@ github.com/aws/aws-sdk-go v1.33.19/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZve github.com/aws/aws-sdk-go v1.34.12/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.35.9 h1:b1HiUpdkFLJyoOQ7zas36YHzjNHH0ivHx/G5lWBeg+U= github.com/aws/aws-sdk-go v1.35.9/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= +github.com/aws/aws-sdk-go v1.35.20/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= github.com/aws/aws-xray-sdk-go v0.9.4/go.mod h1:XtMKdBQfpVut+tJEwI7+dJFRxxRdxHDyVNp2tHXRq04= github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= @@ -267,6 +268,8 @@ github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBK github.com/cs3org/reva v1.3.1-0.20201021065855-dc400f81ecbc/go.mod h1:rTJhfVoZggB5iSPH5oWqQSO+W1iTQIxNmaX/ueS9GAU= github.com/cs3org/reva v1.3.1-0.20201023144216-cdb3d6688da5 h1:nkmk9ywGKpJthWeMYGBiXh4DD6mTCOZLRfGDjp9rsKg= github.com/cs3org/reva v1.3.1-0.20201023144216-cdb3d6688da5/go.mod h1:V50GXMiT524bvxACFkrkZqBzK4BoXLSprxcPshBlSOY= +github.com/cs3org/reva v1.3.1-0.20201104092030-4a28e84e33e4 h1:s8Veu7y00u73tK+Br7B8STunwQ1zMXpdG4yi7xb0mmc= +github.com/cs3org/reva v1.3.1-0.20201104092030-4a28e84e33e4/go.mod h1:2BugQGBdixwte6zc0xqE2yID2SvbwfL06xNulIznhk0= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d h1:SwD98825d6bdB+pEuTxWOXiSjBrHdOl/UVp75eI7JT8= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 h1:iwZdTE0PVqJCos1vaoKsclOGD3ADKpshg3SRtYBbwso=