aboutsummaryrefslogtreecommitdiffstats
path: root/vespa-osgi-testrunner
diff options
context:
space:
mode:
authorMorten Tokle <mortent@verizonmedia.com>2020-09-14 09:01:01 +0200
committerMorten Tokle <mortent@verizonmedia.com>2020-09-14 09:01:01 +0200
commitf98cec37c748f6e5c907245b463c79eeb399bdaf (patch)
treefcb66826df423bfc2831ed600c21afe0bd22d06b /vespa-osgi-testrunner
parent46a055b7b131791f1270320091b896d8373dba74 (diff)
read zone from system info
Diffstat (limited to 'vespa-osgi-testrunner')
-rw-r--r--vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java
index 7e3f61c5c0f..70737859342 100644
--- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java
+++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java
@@ -2,6 +2,7 @@
package com.yahoo.vespa.testrunner;
import ai.vespa.cloud.Environment;
+import ai.vespa.cloud.SystemInfo;
import ai.vespa.cloud.Zone;
import ai.vespa.hosted.api.TestDescriptor;
import ai.vespa.hosted.cd.internal.TestRuntimeProvider;
@@ -52,10 +53,10 @@ public class JunitRunner extends AbstractComponent implements TestRunner {
public JunitRunner(OsgiFramework osgiFramework,
JunitTestRunnerConfig config,
TestRuntimeProvider testRuntimeProvider,
- Zone zone) {
+ SystemInfo systemInfo) {
this.testRuntimeProvider = testRuntimeProvider;
this.bundleContext = getUnrestrictedBundleContext(osgiFramework);
- uglyHackSetCredentialsRootSystemProperty(config, zone);
+ uglyHackSetCredentialsRootSystemProperty(config, systemInfo.zone());
}
// Hack to retrieve bundle context that allows access to other bundles