Skip to content

Commit

Permalink
revert #10632 (#10836)
Browse files Browse the repository at this point in the history
  • Loading branch information
saw-jan authored Apr 26, 2024
1 parent e8c3b22 commit 5c467db
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .drone.env
Original file line number Diff line number Diff line change
@@ -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
8 changes: 1 addition & 7 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -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/",
Expand Down Expand Up @@ -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"
Expand Down
31 changes: 0 additions & 31 deletions tests/drone/web-keycloak.json

This file was deleted.

0 comments on commit 5c467db

Please sign in to comment.