diff options
author | Martin Polden <mpolden@mpolden.no> | 2023-07-17 09:07:52 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2023-07-17 09:07:52 +0200 |
commit | a584ecdf9351be3f7a0f73d618f15ffde9ac40db (patch) | |
tree | bd1ac9e7d6822630f1dc939856fe04d76ffef0e4 /vespa-osgi-testrunner/src | |
parent | a3ed0c6685b97714af646c65163900983344b67c (diff) |
Revert "Set system for Vespa CLI in tests"
This reverts commit 55182a3099924f178263241022b3cffd599f881c.
Diffstat (limited to 'vespa-osgi-testrunner/src')
-rw-r--r-- | vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/VespaCliTestRunner.java | 1 | ||||
-rw-r--r-- | vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/VespaCliTestRunnerTest.java | 2 |
2 files changed, 0 insertions, 3 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 2252682164c..9bb0e7ff955 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 @@ -117,7 +117,6 @@ public class VespaCliTestRunner implements TestRunner { ProcessBuilder builder = new ProcessBuilder("vespa", "test", suitePath.get().toAbsolutePath().toString(), "--application", config.application().toFullString(), "--zone", config.zone().value(), - "--system", config.system().value(), "--target", config.system().isPublic() ? "cloud" : "hosted"); builder.redirectErrorStream(true); // The CI environment variables tells Vespa CLI to omit certain warnings that do not apply to CI environments 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 9f3f306bb8e..fcd0553566f 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 @@ -36,7 +36,6 @@ class VespaCliTestRunnerTest { assertEquals(List.of("vespa", "test", systemTests.toAbsolutePath().toString(), "--application", "t.a.i", "--zone", "dev.aws-us-east-1c", - "--system", "publiccd", "--target", "cloud"), builder.command()); assertTrue(builder.environment().containsKey("CI")); @@ -67,7 +66,6 @@ class VespaCliTestRunnerTest { assertEquals(List.of("vespa", "test", systemTests.toAbsolutePath().toString(), "--application", "t.a.i", "--zone", "dev.aws-us-east-1c", - "--system", "cd", "--target", "hosted"), builder.command()); assertTrue(builder.environment().containsKey("CI")); |