diff options
| author | Håkon Hallingstad <hakon@yahooinc.com> | 2021-12-02 08:49:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-02 08:49:41 +0100 |
| commit | 5574198029611974efac98e383779a0008621208 (patch) | |
| tree | 2b69ea6541948933cca8a7f9412b4f5b07a4190a | |
| parent | 89382c6a0fd4571c1525e82842ce18b69f333cfd (diff) | |
| parent | 3f803442664b3ef8aba532d4f57d6f9a5b355219 (diff) | |
Merge pull request #20325 from vespa-engine/jonmv/specify-cloud-target
Specify cloud target for test runner
| -rw-r--r-- | vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/VespaCliTestRunner.java | 3 | ||||
| -rw-r--r-- | vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/VespaCliTestRunnerTest.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/VespaCliTestRunner.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/VespaCliTestRunner.java index 45ceaa302e0..6405904cd91 100644 --- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/VespaCliTestRunner.java +++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/VespaCliTestRunner.java @@ -116,7 +116,8 @@ public class VespaCliTestRunner implements TestRunner { ProcessBuilder builder = new ProcessBuilder("vespa", "test", suitePath.toAbsolutePath().toString(), "--application", config.application().toFullString(), - "--zone", config.zone().value()); + "--zone", config.zone().value(), + "--target", "cloud"); builder.redirectErrorStream(true); builder.environment().put("VESPA_CLI_HOME", ensureHomeDirectoryForVespaCli().toString()); builder.environment().put("VESPA_CLI_ENDPOINTS", toEndpointsConfig(config)); diff --git a/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/VespaCliTestRunnerTest.java b/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/VespaCliTestRunnerTest.java index d7d8a29c933..9ba8dfdc4dc 100644 --- a/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/VespaCliTestRunnerTest.java +++ b/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/VespaCliTestRunnerTest.java @@ -58,7 +58,8 @@ class VespaCliTestRunnerTest { ProcessBuilder builder = runner.testRunProcessBuilder(TestRunner.Suite.SYSTEM_TEST, testConfig); assertEquals(List.of("vespa", "test", systemTests.toAbsolutePath().toString(), "--application", "t.a.i", - "--zone", "dev.aws-us-east-1c"), + "--zone", "dev.aws-us-east-1c", + "--target", "cloud"), builder.command()); assertEquals("{\"endpoints\":[{\"cluster\":\"default\",\"url\":\"https://dev.endpoint:443/\"}]}", builder.environment().get("VESPA_CLI_ENDPOINTS")); |