From 83607b372b747a2a4f0a649796f7c51d53ef10fc Mon Sep 17 00:00:00 2001 From: amrita Date: Fri, 14 Oct 2022 10:46:42 +0545 Subject: [PATCH] Use global dir variable --- .drone.star | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/.drone.star b/.drone.star index c2c2038ac..68f39c0c5 100644 --- a/.drone.star +++ b/.drone.star @@ -47,6 +47,9 @@ dirs = { "webZip": "/drone/src/zip/web.tar.gz", "e2eYarnZip": "/drone/src/zip/e2e.tar.gz", "acceptanceYarnZip": "/drone/src/zip/acceptance.tar.gz", + "ocisConfig": "tests/config/drone/ocis-config.json", + "ocis": "/srv/app/tmp/ocis", + "ocisRevaDataRoot": "/srv/app/tmp/ocis/owncloud/data", # relative path from the base directory dirs["base"] # this is because the PLUGINS_S3_CACHE does not support absolute paths # PLUGINS_S3_CACHE is used to cache the core and testing app @@ -686,7 +689,7 @@ def localApiTests(ctx, storage, suite, accounts_hash_difficulty = 4): "PATH_TO_OCIS": dirs["base"], "PATH_TO_CORE": "%s/%s" % (dirs["base"], dirs["core"]), "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" % (dirs["ocisRevaDataRoot"] if storage == "owncloud" else ""), "OCIS_SKELETON_STRATEGY": "%s" % ("copy" if storage == "owncloud" else "upload"), "TEST_OCIS": "true", "SEND_SCENARIO_LINE_REFERENCES": "true", @@ -774,7 +777,7 @@ def coreApiTests(ctx, part_number = 1, number_of_parts = 1, storage = "ocis", ac "PATH_TO_OCIS": "%s" % dirs["base"], "PATH_TO_CORE": "%s/%s" % (dirs["base"], dirs["core"]), "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" % (dirs["ocisRevaDataRoot"] if storage == "owncloud" else ""), "OCIS_SKELETON_STRATEGY": "%s" % ("copy" if storage == "owncloud" else "upload"), "TEST_OCIS": "true", "SEND_SCENARIO_LINE_REFERENCES": "true", @@ -889,8 +892,8 @@ def uiTestPipeline(ctx, filterTags, early_fail, runPart = 1, numberOfParts = 1, "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", - "WEB_UI_CONFIG": "%s/tests/config/drone/ocis-config.json" % dirs["base"], + "OCIS_REVA_DATA_ROOT": "%s" % dirs["ocisRevaDataRoot"], + "WEB_UI_CONFIG": "%s/%s" % (dirs["base"], dirs["ocisConfig"]), "TEST_TAGS": finalFilterTags, "LOCAL_UPLOAD_DIR": "/uploads", "NODE_TLS_REJECT_UNAUTHORIZED": 0, @@ -947,7 +950,7 @@ def e2eTests(ctx): "HEADLESS": "true", "OCIS": "true", "RETRY": "1", - "WEB_UI_CONFIG": "%s/tests/config/drone/ocis-config.json" % dirs["base"], + "WEB_UI_CONFIG": "%s/%s" % (dirs["base"], dirs["ocisConfig"]), "LOCAL_UPLOAD_DIR": "/uploads", }, "commands": [ @@ -1075,8 +1078,8 @@ def settingsUITests(ctx, storage = "ocis", accounts_hash_difficulty = 4): "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", - "WEB_UI_CONFIG": "%s/tests/config/drone/ocis-config.json" % dirs["base"], + "OCIS_REVA_DATA_ROOT": "%s" % dirs["ocisRevaDataRoot"], + "WEB_UI_CONFIG": "%s/%s" % (dirs["base"], dirs["ocisConfig"]), "TEST_TAGS": "not @skipOnOCIS and not @skip", "LOCAL_UPLOAD_DIR": "/uploads", "NODE_TLS_REJECT_UNAUTHORIZED": 0, @@ -1878,14 +1881,14 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = "OCIS_CONFIG_DIR": "/root/.ocis/config", "GATEWAY_GRPC_ADDR": "0.0.0.0:9142", # cs3api-validator needs the cs3api gatway exposed "STORAGE_USERS_DRIVER": "%s" % (storage), - "STORAGE_USERS_DRIVER_LOCAL_ROOT": "/srv/app/tmp/ocis/local/root", - "STORAGE_USERS_DRIVER_OCIS_ROOT": "/srv/app/tmp/ocis/storage/users", - "STORAGE_SYSTEM_DRIVER_OCIS_ROOT": "/srv/app/tmp/ocis/storage/metadata", - "SHARING_USER_JSON_FILE": "/srv/app/tmp/ocis/shares.json", + "STORAGE_USERS_DRIVER_LOCAL_ROOT": "%s/local/root" % dirs["ocis"], + "STORAGE_USERS_DRIVER_OCIS_ROOT": "%s/storage/users" % dirs["ocis"], + "STORAGE_SYSTEM_DRIVER_OCIS_ROOT": "%s/storage/metadata" % dirs["ocis"], + "SHARING_USER_JSON_FILE": "%s/shares.json" % dirs["ocis"], "PROXY_ENABLE_BASIC_AUTH": True, - "WEB_UI_CONFIG": "%s/tests/config/drone/ocis-config.json" % dirs["base"], + "WEB_UI_CONFIG": "%s/%s" % (dirs["base"], dirs["ocisConfig"]), "OCIS_LOG_LEVEL": "error", - "SETTINGS_DATA_PATH": "/srv/app/tmp/ocis/settings", + "SETTINGS_DATA_PATH": "%s/settings" % dirs["ocis"], "IDM_CREATE_DEMO_USERS": True, "IDM_ADMIN_PASSWORD": "admin", # override the random admin password from `ocis init` "FRONTEND_SEARCH_MIN_LENGTH": "2", @@ -1996,7 +1999,7 @@ def middlewareService(): "image": OC_OC_TEST_MIDDLEWARE, "environment": { "BACKEND_HOST": "https://ocis-server:9200", - "OCIS_REVA_DATA_ROOT": "/srv/app/tmp/ocis/storage/owncloud/", + "OCIS_REVA_DATA_ROOT": "%s/storage/owncloud/" % dirs["ocis"], "RUN_ON_OCIS": "true", "HOST": "middleware", "REMOTE_UPLOAD_DIR": "/uploads",