remove keycloak services

owncloud · Dec 21, 2021 · 214902c · 214902c
1 parent f5dd86a
commit 214902c
Showing 1 changed file with 8 additions and 41 deletions.
diff --git a/.drone.star b/.drone.star
@@ -1974,15 +1974,13 @@ def parallelDeployAcceptancePipeline(ctx):
                          waitForServices() +
                          oC10Server() +
                          owncloudLog() +
-                         fixPermissions() +
+                         fixSharedDataPermissions() +
                          latestOcisServer() +
                          parallelAcceptance(environment) +
                          failEarly(ctx, early_fail),
-                "services": keycloakDbService() +
-                            oc10DbService() +
+                "services": oc10DbService() +
                             ldapService() +
-                            redis() +
-                            keycloakService(),
+                            redis(),
                 "volumes": [
                     pipeOC10TemplatesVol,
                     pipeOC10PreServerVol,
@@ -2020,8 +2018,11 @@ def parallelAcceptance(env):
         "REVA_LDAP_BIND_DN": "cn=admin,dc=owncloud,dc=com",
         "SKELETON_DIR": "/var/www/owncloud/apps/testing/data/apiSkeleton",
         "PATH_TO_CORE": "/srv/app/testrunner",
-        "OCIS_REVA_DATA_ROOT": "",
+        "OCIS_REVA_DATA_ROOT": "/mnt/data/",
         "EXPECTED_FAILURES_FILE": "/drone/src/tests/parallelDeployAcceptance/expected-failures-API.md",
+        "OCIS_SKELETON_STRATEGY": "copy",
+        "SEND_SCENARIO_LINE_REFERENCES": "true",
+        "UPLOAD_DELETE_WAIT_TIME": "1",
     }
     environment.update(env)
 
@@ -2205,28 +2206,6 @@ def oC10Server():
         },
     ]
 
-def keycloakService():
-    return [{
-        "name": "keycloak",
-        "image": QUAY_IO_KEYCLOAK,
-        "pull": "always",
-        "environment": {
-            "CLOUD_DOMAIN": OCIS_DOMAIN,
-            "OC10_OIDC_CLIENT_SECRET": "oc10-oidc-secret",
-            "LDAP_ADMIN_PASSWORD": "admin",
-            "DB_VENDOR": "POSTGRES",
-            "DB_ADDR": "keycloak-db",
-            "DB_DATABASE": "keycloak",
-            "DB_USER": "keycloak",
-            "DB_SCHEMA": "public",
-            "DB_PASSWORD": "keycloak",
-            "KEYCLOAK_USER": "admin",
-            "KEYCLOAK_PASSWORD": "admin",
-            "PROXY_ADDRESS_FORWARDING": "true",
-            "KEYCLOAK_IMPORT": "%s/keycloak/owncloud-realm.json" % (PARALLEL_DEPLOY_CONFIG_PATH),
-        },
-    }]
-
 def ldapService():
     return [{
         "name": "openldap",
@@ -2248,18 +2227,6 @@ def ldapService():
         ],
     }]
 
-def keycloakDbService():
-    return [{
-        "name": "keycloak-db",
-        "image": POSTGRES,
-        "pull": "always",
-        "environment": {
-            "POSTGRES_DB": "keycloak",
-            "POSTGRES_USER": "keycloak",
-            "POSTGRES_PASSWORD": "keycloak",
-        },
-    }]
-
 def oc10DbService():
     return [
         {
@@ -2318,7 +2285,7 @@ def owncloudLog():
         "depends_on": ["wait-for-oc10"],
     }]
 
-def fixPermissions():
+def fixSharedDataPermissions():
     return [{
         "name": "fix-permissions",
         "image": OC_CI_PHP,