diff options
| author | Martin Polden <mpolden@mpolden.no> | 2023-07-17 09:10:02 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2023-07-17 09:10:02 +0200 |
| commit | 484a7393a871aaec4fe1ed58c861acc071bd895a (patch) | |
| tree | 7822529f712d9aad1825b2e904b299cc1169e483 /vespa-osgi-testrunner | |
| parent | a584ecdf9351be3f7a0f73d618f15ffde9ac40db (diff) | |
Set system environment variable in test runner
Diffstat (limited to 'vespa-osgi-testrunner')
| -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, 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..cf2a1700f28 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 @@ -122,6 +122,7 @@ public class VespaCliTestRunner implements TestRunner { // The CI environment variables tells Vespa CLI to omit certain warnings that do not apply to CI environments builder.environment().put("CI", "true"); builder.environment().put("VESPA_CLI_CLOUD_CI", "true"); + builder.environment().put("VESPA_CLI_CLOUD_SYSTEM", config.system().value()); builder.environment().put("VESPA_CLI_HOME", ensureDirectoryForVespaCli("cli-home").toString()); builder.environment().put("VESPA_CLI_CACHE_DIR", ensureDirectoryForVespaCli("cli-cache").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 fcd0553566f..288442eaf7d 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 @@ -42,6 +42,7 @@ class VespaCliTestRunnerTest { assertTrue(builder.environment().containsKey("VESPA_CLI_CLOUD_CI")); assertTrue(builder.environment().containsKey("VESPA_CLI_HOME")); assertTrue(builder.environment().containsKey("VESPA_CLI_CACHE_DIR")); + assertEquals("publiccd", builder.environment().get("VESPA_CLI_CLOUD_SYSTEM")); assertEquals("{\"endpoints\":[{\"cluster\":\"default\",\"url\":\"https://dev.endpoint:443/\"}]}", builder.environment().get("VESPA_CLI_ENDPOINTS")); assertEquals(artifacts.resolve("key").toAbsolutePath().toString(), @@ -72,6 +73,7 @@ class VespaCliTestRunnerTest { assertTrue(builder.environment().containsKey("VESPA_CLI_CLOUD_CI")); assertTrue(builder.environment().containsKey("VESPA_CLI_HOME")); assertTrue(builder.environment().containsKey("VESPA_CLI_CACHE_DIR")); + assertEquals("cd", builder.environment().get("VESPA_CLI_CLOUD_SYSTEM")); assertEquals("{\"endpoints\":[{\"cluster\":\"default\",\"url\":\"https://dev.endpoint:443/\"}]}", builder.environment().get("VESPA_CLI_ENDPOINTS")); assertEquals("/opt/vespa/var/vespa/sia/key", |