From 7b3bb22da3deebdfd866fa66db20f979c44eacc8 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Thu, 10 Sep 2020 18:58:43 +0545 Subject: [PATCH] set dataroot and use delete command to delete user data --- .drone.star | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.drone.star b/.drone.star index b73f7fe7c..3f11c3515 100644 --- a/.drone.star +++ b/.drone.star @@ -42,7 +42,6 @@ def testPipelines(ctx): return pipelines def localApiTests(ctx, coreBranch = 'master', coreCommit = '', storage = 'owncloud'): - dataRootConfig = "'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/reva/'" if storage == 'owncloud' else "'DELETE_USER_DATA_CMD': 'rm -rf /srv/app/tmp/ocis/root/*'" return { 'kind': 'pipeline', 'type': 'docker', @@ -61,7 +60,8 @@ def localApiTests(ctx, coreBranch = 'master', coreCommit = '', storage = 'ownclo 'pull': 'always', 'environment' : { 'TEST_SERVER_URL': 'http://reva-server:9140', - dataRootConfig, + 'OCIS_REVA_DATA_ROOT': '%s' % ('/srv/app/tmp/reva/' if storage == 'owncloud' else ''), + 'DELETE_USER_DATA_CMD': '%s' % ('rm -rf /srv/app/tmp/reva/data/*' if storage == 'owncloud' else 'rm -rf /srv/app/tmp/ocis/root/*'), 'SKELETON_DIR': '/srv/app/tmp/testing/data/apiSkeleton', 'TEST_EXTERNAL_USER_BACKENDS':'true', 'REVA_LDAP_HOSTNAME':'ldap', @@ -117,7 +117,8 @@ def coreApiTests(ctx, coreBranch = 'master', coreCommit = '', part_number = 1, n 'pull': 'always', 'environment' : { 'TEST_SERVER_URL': 'http://reva-server:9140', - 'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/reva/', + 'OCIS_REVA_DATA_ROOT': '%s' % ('/srv/app/tmp/reva/' if storage == 'owncloud' else ''), + 'DELETE_USER_DATA_CMD': '%s' % ('rm -rf /srv/app/tmp/reva/data/*' if storage == 'owncloud' else 'rm -rf /srv/app/tmp/ocis/root/*'), 'SKELETON_DIR': '/srv/app/tmp/testing/data/apiSkeleton', 'TEST_EXTERNAL_USER_BACKENDS':'true', 'REVA_LDAP_HOSTNAME':'ldap',