From 5d190620751781c1945f36086939d3eb8492fe46 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 23 Mar 2022 08:18:30 +0100 Subject: [PATCH] switch tests to yaml config --- .drone.star | 2 +- .../drone/ocis/proxy.json | 109 ------------------ .../drone/ocis/proxy.yaml | 54 +++++++++ 3 files changed, 55 insertions(+), 110 deletions(-) delete mode 100644 tests/parallelDeployAcceptance/drone/ocis/proxy.json create mode 100644 tests/parallelDeployAcceptance/drone/ocis/proxy.yaml diff --git a/.drone.star b/.drone.star index e5e702c35..faf0739e8 100644 --- a/.drone.star +++ b/.drone.star @@ -2272,7 +2272,7 @@ def copyConfigs(): "commands": [ # ocis proxy config "mkdir -p /etc/ocis", - "cp %s/ocis/proxy.json /etc/ocis/proxy.json" % (PARALLEL_DEPLOY_CONFIG_PATH), + "cp %s/ocis/proxy.yaml /etc/ocis/proxy.yaml" % (PARALLEL_DEPLOY_CONFIG_PATH), # oc10 configs "mkdir -p /etc/templates", "mkdir -p /etc/pre_server.d", diff --git a/tests/parallelDeployAcceptance/drone/ocis/proxy.json b/tests/parallelDeployAcceptance/drone/ocis/proxy.json deleted file mode 100644 index 6333545da..000000000 --- a/tests/parallelDeployAcceptance/drone/ocis/proxy.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "log": { - "level": "PROXY_LOG_LEVEL" - }, - "policy_selector": { - "claims": { - "default_policy": "oc10", - "unauthenticated_policy": "oc10" - } - }, - "policies": [ - { - "name": "ocis", - "routes": [ - { - "endpoint": "/", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/.well-known/", - "backend": "http://localhost:9130" - }, - { - "type": "regex", - "endpoint": "/ocs/v[12].php/cloud/user/signing-key", - "backend": "http://localhost:9110" - }, - { - "endpoint": "/ocs/", - "backend": "http://localhost:9140" - }, - { - "type": "query", - "endpoint": "/remote.php/?preview=1", - "backend": "http://localhost:9115" - }, - { - "endpoint": "/remote.php/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/dav/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/webdav/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/status.php", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/index.php/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/index.php/login", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/login", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/data", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/graph/", - "backend": "http://localhost:9120" - }, - { - "endpoint": "/app/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/archiver", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/graph-explorer/", - "backend": "http://localhost:9135" - }, - { - "endpoint": "/api/v0/settings", - "backend": "http://localhost:9190" - }, - { - "endpoint": "/settings.js", - "backend": "http://localhost:9190" - } - ] - }, - { - "name": "oc10", - "routes": [ - { - "endpoint": "/", - "backend": "http://oc10:8080" - }, - { - "endpoint": "/data", - "backend": "http://localhost:9140" - } - ] - } - ] -} diff --git a/tests/parallelDeployAcceptance/drone/ocis/proxy.yaml b/tests/parallelDeployAcceptance/drone/ocis/proxy.yaml new file mode 100644 index 000000000..2d1a6aced --- /dev/null +++ b/tests/parallelDeployAcceptance/drone/ocis/proxy.yaml @@ -0,0 +1,54 @@ +--- +policy_selector: + claims: + default_policy: oc10 + unauthenticated_policy: oc10 +policies: +- name: ocis + routes: + - endpoint: "/" + backend: http: //localhost:9100 + - endpoint: "/.well-known/" + backend: http: //localhost:9130 + - type: regex + endpoint: "/ocs/v[12].php/cloud/user/signing-key" + backend: http: //localhost:9110 + - endpoint: "/ocs/" + backend: http: //localhost:9140 + - type: query + endpoint: "/remote.php/?preview=1" + backend: http: //localhost:9115 + - endpoint: "/remote.php/" + backend: http: //localhost:9140 + - endpoint: "/dav/" + backend: http: //localhost:9140 + - endpoint: "/webdav/" + backend: http: //localhost:9140 + - endpoint: "/status.php" + backend: http: //localhost:9140 + - endpoint: "/index.php/" + backend: http: //localhost:9140 + - endpoint: "/index.php/login" + backend: http: //localhost:9100 + - endpoint: "/login" + backend: http: //localhost:9100 + - endpoint: "/data" + backend: http: //localhost:9140 + - endpoint: "/graph/" + backend: http: //localhost:9120 + - endpoint: "/app/" + backend: http: //localhost:9140 + - endpoint: "/archiver" + backend: http: //localhost:9140 + - endpoint: "/graph-explorer/" + backend: http: //localhost:9135 + - endpoint: "/api/v0/settings" + backend: http: //localhost:9190 + - endpoint: "/settings.js" + backend: http: //localhost:9190 +- name: oc10 + routes: + - endpoint: "/" + backend: http: //oc10:8080 + - endpoint: "/data" + backend: http: //localhost:9140