diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-09-13 16:02:58 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-09-13 16:02:58 +0200 |
| commit | 6ea1a895c249153132a24b00e50785ccdbe78b6e (patch) | |
| tree | 16d781b48c70c6dd317236b9b5be2d22ebb8d072 /controller-server/src/test/resources | |
| parent | 731d4fe97b56d6a0ad2f37e19c2d97b366072d47 (diff) | |
Simplify
Diffstat (limited to 'controller-server/src/test/resources')
| -rw-r--r-- | controller-server/src/test/resources/test_runner_services.xml-aws | 64 | ||||
| -rw-r--r-- | controller-server/src/test/resources/test_runner_services.xml-cd | 2 |
2 files changed, 1 insertions, 65 deletions
diff --git a/controller-server/src/test/resources/test_runner_services.xml-aws b/controller-server/src/test/resources/test_runner_services.xml-aws deleted file mode 100644 index ded306d69ce..00000000000 --- a/controller-server/src/test/resources/test_runner_services.xml-aws +++ /dev/null @@ -1,64 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<services xmlns:deploy='vespa' version='1.0'> - <container version='1.0' id='tester'> - - <component id="com.yahoo.vespa.hosted.testrunner.TestRunner" bundle="vespa-testrunner-components"> - <config name="com.yahoo.vespa.hosted.testrunner.test-runner"> - <artifactsPath>artifacts</artifactsPath> - <surefireMemoryMb>2150</surefireMemoryMb> - <useAthenzCredentials>true</useAthenzCredentials> - <useTesterCertificate>false</useTesterCertificate> - </config> - </component> - - <handler id="com.yahoo.vespa.hosted.testrunner.TestRunnerHandler" bundle="vespa-testrunner-components"> - <binding>http://*/tester/v1/*</binding> - </handler> - - <http> - <!-- Make sure 4080 is the first port. This will be used by the config server. --> - <server id='default' port='4080'/> - <server id='testertls4443' port='4443'> - <config name="jdisc.http.connector"> - <tlsClientAuthEnforcer> - <enable>true</enable> - <pathWhitelist> - <item>/status.html</item> - <item>/state/v1/config</item> - </pathWhitelist> - </tlsClientAuthEnforcer> - </config> - <ssl> - <private-key-file>/var/lib/sia/keys/vespa.vespa.tenant.key.pem</private-key-file> - <certificate-file>/var/lib/sia/certs/vespa.vespa.tenant.cert.pem</certificate-file> - <client-authentication>want</client-authentication> - </ssl> - </server> - <filtering> - <access-control domain='vespa.vespa.cd'> - <exclude> - <binding>http://*/tester/v1/*</binding> - </exclude> - </access-control> - <request-chain id="testrunner-api"> - <filter id='authz-filter' class='com.yahoo.jdisc.http.filter.security.athenz.AthenzAuthorizationFilter' bundle="jdisc-security-filters"> - <config name="jdisc.http.filter.security.athenz.athenz-authorization-filter"> - <credentialsToVerify>TOKEN_ONLY</credentialsToVerify> - <roleTokenHeaderName>Yahoo-Role-Auth</roleTokenHeaderName> - </config> - <component id="com.yahoo.jdisc.http.filter.security.athenz.StaticRequestResourceMapper" bundle="jdisc-security-filters"> - <config name="jdisc.http.filter.security.athenz.static-request-resource-mapper"> - <resourceName>vespa.vespa.cd:tester-application</resourceName> - <action>deploy</action> - </config> - </component> - </filter> - </request-chain> - </filtering> - </http> - - <nodes count="1" allocated-memory="25%"> - <resources vcpu="0.50" memory="8.00" disk="50.00"/> - </nodes> - </container> -</services> diff --git a/controller-server/src/test/resources/test_runner_services.xml-cd b/controller-server/src/test/resources/test_runner_services.xml-cd index 1e89225be0c..3f35cd1d03b 100644 --- a/controller-server/src/test/resources/test_runner_services.xml-cd +++ b/controller-server/src/test/resources/test_runner_services.xml-cd @@ -58,7 +58,7 @@ </http> <nodes count="1" allocated-memory="17%"> - <resources vcpu="2.30" memory="12.00" disk="75.00"/> + <resources vcpu="2.00" memory="12.00" disk="75.00"/> </nodes> </container> </services> |