From 76b8e0421f53b4ed4dae7f90e578cf7e88a14810 Mon Sep 17 00:00:00 2001
From: Saw-jan <saw.jan.grg3e@gmail.com>
Date: Wed, 20 Mar 2024 17:45:53 +0545
Subject: [PATCH] do not use web config file with keycloak

---
 .drone.star | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/.drone.star b/.drone.star
index 3cf2ba70fb1..47747f5c80f 100644
--- a/.drone.star
+++ b/.drone.star
@@ -967,7 +967,7 @@ def installPlaywright():
             "PLAYWRIGHT_BROWSERS_PATH": ".playwright",
         },
         "commands": [
-            "pnpm exec playwright install --with-deps",
+            "pnpm exec playwright install --with-deps chromium",
         ],
     }]
 
@@ -1226,8 +1226,7 @@ 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"
@@ -1235,8 +1234,6 @@ def ocisService(type, tika_enabled = False, enforce_password_public_link = False
         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
@@ -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",
             ],
@@ -2338,6 +2334,7 @@ def e2eTestsOnKeycloak(ctx):
             "temp": {},
         },
     ]
+
     if not "full-ci" in ctx.build.title.lower() and ctx.build.event != "cron":
         return []
 
@@ -2352,7 +2349,6 @@ def e2eTestsOnKeycloak(ctx):
                  installPlaywright() +
                  keycloakService() +
                  restoreBuildArtifactCache(ctx, "web-dist", "dist") +
-                 setupServerConfigureWeb("2") +
                  restoreOcisCache() +
                  ocisService("keycloak") +
                  [