From 6d50ada4328aafde04041bab7873ac35e92b7874 Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Thu, 13 Jun 2024 13:04:52 +0200 Subject: [PATCH 1/2] try to fix wopi validator test --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index cdb55be3ea..07863ede15 100644 --- a/.drone.star +++ b/.drone.star @@ -987,7 +987,7 @@ def wopiValidatorTests(ctx, storage, wopiServerType, accounts_hash_difficulty = ], }, ] + - ocisServer(storage, accounts_hash_difficulty, [], [], "wopi_validator") + + ocisServer(storage, accounts_hash_difficulty, [], [], "wopi_validator", {"OCIS_EXCLUDE_RUN_SERVICES": "app-provider"}) + wopiServer + [ { From 6e1d7452d6c87def89955028d91b241f6aaa220a Mon Sep 17 00:00:00 2001 From: Saw-jan Date: Thu, 13 Jun 2024 17:06:40 +0545 Subject: [PATCH 2/2] fix inbuilt wopi server pipeline --- .drone.star | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index 07863ede15..3ae8c35f10 100644 --- a/.drone.star +++ b/.drone.star @@ -902,8 +902,9 @@ def wopiValidatorTests(ctx, storage, wopiServerType, accounts_hash_difficulty = ocis_bin = "ocis/bin/ocis" validatorTests = [] - wopiServer = [] + extra_server_environment = {} + if wopiServerType == "cs3": wopiServer = [ { @@ -918,6 +919,10 @@ def wopiValidatorTests(ctx, storage, wopiServerType, accounts_hash_difficulty = }, ] else: + extra_server_environment = { + "OCIS_EXCLUDE_RUN_SERVICES": "app-provider", + } + wopiServer = [ { "name": "wopiserver", @@ -987,7 +992,7 @@ def wopiValidatorTests(ctx, storage, wopiServerType, accounts_hash_difficulty = ], }, ] + - ocisServer(storage, accounts_hash_difficulty, [], [], "wopi_validator", {"OCIS_EXCLUDE_RUN_SERVICES": "app-provider"}) + + ocisServer(storage, accounts_hash_difficulty, deploy_type = "wopi_validator", extra_server_environment = extra_server_environment) + wopiServer + [ {