Set system for Vespa CLI in tests

2 files changed, 3 insertions, 0 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 9bb0e7ff955..2252682164c 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,6 +117,7 @@ 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 fcd0553566f..9f3f306bb8e 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,6 +36,7 @@ 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"));
@@ -66,6 +67,7 @@ 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"));