From c1bd9bd71d971b2c10aba95fa571ce71a16e9a48 Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Wed, 23 Oct 2024 11:11:28 +0200 Subject: [PATCH] fix --- .drone.star | 2 +- .../serviceAvailabilityCheck.feature | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.drone.star b/.drone.star index d4f0d0fc85..563c49febc 100644 --- a/.drone.star +++ b/.drone.star @@ -241,7 +241,6 @@ config = { "extraServerEnvironment": { "GATEWAY_GRPC_ADDR": "0.0.0.0:9142", "COLLABORATION_DEBUG_ADDR": "0.0.0.0:9304", - "OCIS_ADD_RUN_SERVICES": "collaboration", }, }, "cliCommands": { @@ -3152,6 +3151,7 @@ def wopiCollaborationService(name): "COLLABORATION_CS3API_DATAGATEWAY_INSECURE": "true", "OCIS_JWT_SECRET": "some-ocis-jwt-secret", "COLLABORATION_WOPI_SECRET": "some-wopi-secret", + "OCIS_ADD_RUN_SERVICES": "collaboration", } if name == "collabora": diff --git a/tests/acceptance/features/apiCollaboration/serviceAvailabilityCheck.feature b/tests/acceptance/features/apiCollaboration/serviceAvailabilityCheck.feature index 6179496c06..024ef10251 100644 --- a/tests/acceptance/features/apiCollaboration/serviceAvailabilityCheck.feature +++ b/tests/acceptance/features/apiCollaboration/serviceAvailabilityCheck.feature @@ -3,13 +3,17 @@ Feature: service health check Scenario: check service health When a user requests these endpoints: - | endpoint | service | - | %base_url_without_scheme_and_port%:9304/healthz | collaboration | + | endpoint | service | + | wopi-onlyoffice:9304/healthz | collaboration | + | wopi-collabora:9304/healthz | collaboration | + | wopi-fakeoffice:9304/healthz | collaboration | Then the HTTP status code of responses on all endpoints should be "200" Scenario: check service readiness When a user requests these endpoints: - | endpoint | service | - | %base_url_without_scheme_and_port%:9304/readyz | collaboration | + | endpoint | service | + | wopi-onlyoffice:9304/readyz | collaboration | + | wopi-collabora:9304/readyz | collaboration | + | wopi-fakeoffice:9304/readyz | collaboration | Then the HTTP status code of responses on all endpoints should be "200" \ No newline at end of file