Skip to content

Commit

Permalink
do not use web config file with keycloak
Browse files Browse the repository at this point in the history
  • Loading branch information
saw-jan committed Mar 20, 2024
1 parent 17b2f93 commit 76b8e04
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,7 @@ def installPlaywright():
"PLAYWRIGHT_BROWSERS_PATH": ".playwright",
},
"commands": [
"pnpm exec playwright install --with-deps",
"pnpm exec playwright install --with-deps chromium",
],
}]

Expand Down Expand Up @@ -1226,17 +1226,14 @@ def ocisService(type, tika_enabled = False, enforce_password_public_link = False
environment["OCIS_EXCLUDE_RUN_SERVICES"] = "idp"
environment["GRAPH_ASSIGN_DEFAULT_USER_ROLE"] = "false"
environment["GRAPH_USERNAME_MATCH"] = "none"

if type == "app-provider":
elif 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"
environment["NATS_NATS_HOST"] = "0.0.0.0"
environment["NATS_NATS_PORT"] = 9233
else:
environment["WEB_UI_CONFIG_FILE"] = "%s" % dir["ocisConfig"]
environment["STORAGE_HOME_DRIVER"] = "ocis"
environment["STORAGE_USERS_DRIVER"] = "ocis"

if tika_enabled:
environment["FRONTEND_FULL_TEXT_SEARCH_ENABLED"] = True
Expand Down Expand Up @@ -2256,10 +2253,9 @@ def keycloakService():
return [
{
"name": "generate-keycloak-certs",
"image": OC_UBUNTU,
"image": OC_CI_NODEJS,
"commands": [
"apt install openssl -y",
"mkdir keycloak-certs",
"mkdir -p keycloak-certs",
"openssl req -x509 -newkey rsa:2048 -keyout keycloak-certs/keycloakkey.pem -out keycloak-certs/keycloakcrt.pem -nodes -days 365 -subj '/CN=keycloak'",
"chmod -R 777 keycloak-certs",
],
Expand Down Expand Up @@ -2338,6 +2334,7 @@ def e2eTestsOnKeycloak(ctx):
"temp": {},
},
]

if not "full-ci" in ctx.build.title.lower() and ctx.build.event != "cron":
return []

Expand All @@ -2352,7 +2349,6 @@ def e2eTestsOnKeycloak(ctx):
installPlaywright() +
keycloakService() +
restoreBuildArtifactCache(ctx, "web-dist", "dist") +
setupServerConfigureWeb("2") +
restoreOcisCache() +
ocisService("keycloak") +
[
Expand Down

0 comments on commit 76b8e04

Please sign in to comment.