diff options
| author | Harald Musum <musum@oath.com> | 2018-08-19 09:16:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-19 09:16:28 +0200 |
| commit | 643eca70f367ef5dfa26b1f6e0779db2839c7e34 (patch) | |
| tree | 339fcb3731ba3139745a790d346680315d01d4e3 /controller-server | |
| parent | bf8058c1c2f2e48a727b0447faef9ba5beb1eca8 (diff) | |
| parent | 4c4d4333bf936c08d402b89bcd10af094d9f07b5 (diff) | |
Merge pull request #6622 from vespa-engine/jvenstad/testrunner-logging
Jvenstad/testrunner logging
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java | 7 | ||||
| -rw-r--r-- | controller-server/src/test/resources/test_runner_services.xml-cd | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index f62cc1b3e30..fb0c9d42f45 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -225,7 +225,7 @@ public class InternalStepRunner implements StepRunner { Versions versions = controller.jobController().run(id).get().versions(); Version platform = setTheStage ? versions.sourcePlatform().orElse(versions.targetPlatform()) : versions.targetPlatform(); ApplicationVersion application = setTheStage ? versions.sourceApplication().orElse(versions.targetApplication()) : versions.targetApplication(); - logger.log("Checking installation of " + platform + " and " + application + " ..."); + logger.log("Checking installation of " + platform + " and " + application.id() + " ..."); if (nodesConverged(id.application(), id.type(), platform, logger) && servicesConverged(id.application(), id.type())) { logger.log("Installation succeeded!"); @@ -441,6 +441,11 @@ public class InternalStepRunner implements StepRunner { " <http>\n" + " <server id='default' port='4080'/>\n" + " <filtering>\n" + + " <access-control domain='" + domain + "'>\n" + // Set up dummy access control to pass validation :/ + " <exclude>\n" + + " <binding>http://*/tester/v1/*</binding>\n" + + " </exclude>\n" + + " </access-control>\n" + " <request-chain id=\"testrunner-api\">\n" + " <filter id='authz-filter' class='com.yahoo.jdisc.http.filter.security.athenz.AthenzAuthorizationFilter' bundle=\"jdisc-security-filters\">\n" + " <config name=\"jdisc.http.filter.security.athenz.athenz-authorization-filter\">\n" + 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 d168b38e7bd..9c6cfe6fe2d 100644 --- a/controller-server/src/test/resources/test_runner_services.xml-cd +++ b/controller-server/src/test/resources/test_runner_services.xml-cd @@ -15,6 +15,11 @@ <http> <server id='default' port='4080'/> <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"> |