Merge 8e689c0 into 8d6a81e

wikimedia · Jan 6, 2020 · 01f3a08 · 01f3a08
2 parents 8d6a81e + 8e689c0
commit 01f3a08
Show file tree

Hide file tree

Showing 8 changed files with 856 additions and 1,339 deletions.
diff --git a/config.frontend.test.yaml b/config.frontend.test.yaml
@@ -8,11 +8,8 @@ default_project: &default_project
               - path: projects/v1/default.wmf.yaml
                 options: &default_options
                   parsoid:
-                    host: https://parsoid-beta.wmflabs.org
+                    host: https://en.wikipedia.beta.wmflabs.org/w/rest.php
                     grace_ttl: 1000000
-                    php_host: https://en.wikipedia.beta.wmflabs.org/w/rest.php
-                    proxy:
-                      default_variant: php
                   action:
                     apiUriTemplate: "{{'https://{domain}/w/api.php'}}"
                     baseUriTemplate: "{{'https://{domain}/api/rest_v1'}}"

diff --git a/config.fullstack.test.yaml b/config.fullstack.test.yaml
@@ -7,11 +7,8 @@ default_project: &default_project
               - path: projects/v1/default.wmf.yaml
                 options: &default_options
                   parsoid:
-                    host: https://parsoid-beta.wmflabs.org
+                    host: https://en.wikipedia.beta.wmflabs.org/w/rest.php
                     grace_ttl: 1000000
-                    php_host: https://en.wikipedia.beta.wmflabs.org/w/rest.php
-                    proxy:
-                      default_variant: php
                   action:
                     apiUriTemplate: "{{'https://{domain}/w/api.php'}}"
                     baseUriTemplate: "{{'https://{domain}/api/rest_v1'}}"