Skip to content

Commit 0fe283f

Browse files
authored
always run appProvider suite in the CI (#845)
* always run appProvider suite in the CI * trigger CI
1 parent d2ce440 commit 0fe283f

File tree

1 file changed

+27
-9
lines changed

1 file changed

+27
-9
lines changed

.woodpecker.star

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ config = {
9494
"skip": False,
9595
"suites": [
9696
"app-provider",
97-
"app-provider-onlyOffice",
9897
],
9998
"extraServerEnvironment": {
10099
"GATEWAY_GRPC_ADDR": "0.0.0.0:9142",
@@ -103,11 +102,25 @@ config = {
103102
"NATS_NATS_HOST": "0.0.0.0",
104103
"NATS_NATS_PORT": 9233,
105104
"COLLABORA_DOMAIN": "collabora:9980",
106-
"ONLYOFFICE_DOMAIN": "onlyoffice:443",
107105
"FRONTEND_APP_HANDLER_SECURE_VIEW_APP_ADDR": "eu.opencloud.api.collaboration.Collabora",
108106
"WEB_UI_CONFIG_FILE": None,
109107
},
110108
},
109+
"app-provider-onlyOffice": {
110+
"skip": False,
111+
"suites": [
112+
"app-provider-onlyOffice",
113+
],
114+
"extraServerEnvironment": {
115+
"GATEWAY_GRPC_ADDR": "0.0.0.0:9142",
116+
"MICRO_REGISTRY": "nats-js-kv",
117+
"MICRO_REGISTRY_ADDRESS": "0.0.0.0:9233",
118+
"NATS_NATS_HOST": "0.0.0.0",
119+
"NATS_NATS_PORT": 9233,
120+
"ONLYOFFICE_DOMAIN": "onlyoffice:443",
121+
"WEB_UI_CONFIG_FILE": None,
122+
},
123+
},
111124
"oidc-refresh-token": {
112125
"skip": False,
113126
"features": [
@@ -450,7 +463,7 @@ def e2eTests(ctx):
450463
for item in default:
451464
params[item] = matrix[item] if item in matrix else default[item]
452465

453-
if "app-provider" in suite and not "full-ci" in ctx.build.title.lower() and ctx.build.event != "cron":
466+
if "app-provider-onlyOffice" in suite and not "full-ci" in ctx.build.title.lower() and ctx.build.event != "cron":
454467
continue
455468

456469
if "ocm" in suite and not "full-ci" in ctx.build.title.lower() and ctx.build.event != "cron":
@@ -483,17 +496,22 @@ def e2eTests(ctx):
483496
else:
484497
steps += restoreOpenCloudCache()
485498

486-
if "app-provider" in suite:
499+
if "app-provider-onlyOffice" in suite:
487500
environment["FAIL_ON_UNCAUGHT_CONSOLE_ERR"] = False
501+
steps += onlyofficeService() + \
502+
waitForServices("onlyOffice", ["onlyoffice:443"]) + \
503+
openCloudService(params["extraServerEnvironment"]) + \
504+
wopiCollaborationService("onlyoffice") + \
505+
waitForServices("wopi", ["wopi-onlyoffice:9300"])
488506

489-
# app-provider specific steps
507+
elif "app-provider" in suite:
508+
environment["FAIL_ON_UNCAUGHT_CONSOLE_ERR"] = False
490509
steps += collaboraService() + \
491-
onlyofficeService() + \
492-
waitForServices("online-offices", ["collabora:9980", "onlyoffice:443"]) + \
510+
waitForServices("collabora", ["collabora:9980"]) + \
493511
openCloudService(params["extraServerEnvironment"]) + \
494512
wopiCollaborationService("collabora") + \
495-
wopiCollaborationService("onlyoffice") + \
496-
waitForServices("wopi", ["wopi-collabora:9300", "wopi-onlyoffice:9300"])
513+
waitForServices("wopi", ["wopi-collabora:9300"])
514+
497515
elif "ocm" in suite:
498516
steps += openCloudService(params["extraServerEnvironment"]) + \
499517
(openCloudService(params["extraServerEnvironment"], "federation") if params["federationServer"] else [])

0 commit comments

Comments
 (0)