diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2023-07-11 11:21:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-11 11:21:45 +0200 |
| commit | f23ac87c06d4d87de8263524acd579b310acca2f (patch) | |
| tree | 8ddf058302fa489205fdeaf0884740db91492853 | |
| parent | 570ba3e4fb89f8e011a1e09d72d2348800d998a6 (diff) | |
| parent | 98f6f3e7752bd279c5e1bcae48ac92a3b54eb55c (diff) | |
Merge pull request #27738 from vespa-engine/mpolden/fix-target
Set target from system
| -rw-r--r-- | vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/VespaCliTestRunner.java | 15 |
1 files changed, 7 insertions, 8 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 274fa91a59c..5816cd54526 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,7 @@ public class VespaCliTestRunner implements TestRunner { ProcessBuilder builder = new ProcessBuilder("vespa", "test", suitePath.get().toAbsolutePath().toString(), "--application", config.application().toFullString(), "--zone", config.zone().value(), - "--target", "cloud"); + "--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 builder.environment().put("CI", "true"); @@ -130,13 +130,12 @@ public class VespaCliTestRunner implements TestRunner { } private static String toSuiteDirectoryName(Suite suite) { - switch (suite) { - case SYSTEM_TEST: return "system-test"; - case STAGING_SETUP_TEST: return "staging-setup"; - case STAGING_TEST: return "staging-test"; - case PRODUCTION_TEST: return "production-test"; - default: throw new IllegalArgumentException("Unsupported test suite '" + suite + "'"); - } + return switch (suite) { + case SYSTEM_TEST -> "system-test"; + case STAGING_SETUP_TEST -> "staging-setup"; + case STAGING_TEST -> "staging-test"; + case PRODUCTION_TEST -> "production-test"; + }; } private void log(Level level, String message, Throwable thrown) { |