diff --git a/.drone.env b/.drone.env index 02e1412a9b6..881feb73124 100644 --- a/.drone.env +++ b/.drone.env @@ -1,3 +1,3 @@ # The version of OCIS to use in pipelines that test against OCIS -OCIS_COMMITID=78ba483784cc636c74e1b8b229779f9abe9a5470 +OCIS_COMMITID=dadc78d4ffc16a97d4e8ce5a342f82bc3f454787 OCIS_BRANCH=master diff --git a/.drone.star b/.drone.star index 01fd32b51df..eaf2352408f 100644 --- a/.drone.star +++ b/.drone.star @@ -43,7 +43,6 @@ dir = { "commentsFile": "/var/www/owncloud/web/comments.file", "app": "/srv/app", "ocisConfig": "/var/www/owncloud/web/tests/drone/config-ocis.json", - "webKeycloakConfig": "/var/www/owncloud/web/tests/drone/web-keycloak.json", "ocisIdentifierRegistrationConfig": "/var/www/owncloud/web/tests/drone/identifier-registration.yml", "ocisRevaDataRoot": "/srv/app/tmp/ocis/owncloud/data/", "testingDataDir": "/srv/app/testing/data/", @@ -1237,12 +1236,7 @@ def ocisService(type, tika_enabled = False, enforce_password_public_link = False environment["GRAPH_ASSIGN_DEFAULT_USER_ROLE"] = "false" environment["GRAPH_USERNAME_MATCH"] = "none" - # TODO: after ocis issue is fixed - # - use config from dir["ocisConfig"] - # - remove config file from dir["webKeycloakConfig"] - # issue: https://github.com/owncloud/ocis/issues/8703 - environment["WEB_UI_CONFIG_FILE"] = "%s" % dir["webKeycloakConfig"] - elif type == "app-provider": + if type == "app-provider": environment["GATEWAY_GRPC_ADDR"] = "0.0.0.0:9142" environment["MICRO_REGISTRY"] = "nats-js-kv" environment["MICRO_REGISTRY_ADDRESS"] = "0.0.0.0:9233" diff --git a/tests/drone/web-keycloak.json b/tests/drone/web-keycloak.json deleted file mode 100644 index 24eef31bd41..00000000000 --- a/tests/drone/web-keycloak.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "server": "https://ocis:9200", - "theme": "https://ocis:9200/themes/owncloud/theme.json", - "openIdConnect": { - "client_id": "web", - "response_type": "code", - "scope": "openid profile email" - }, - "options": { - "topCenterNotifications": true, - "disablePreviews": true, - "displayResourcesLazy": false, - "sidebar": { - "shares": { - "showAllOnLoad": true - } - }, - "routing": { - "idBased": false - } - }, - "apps": [ - "files", - "draw-io", - "text-editor", - "media-viewer", - "pdf-viewer", - "search", - "admin-settings" - ] -}