diff options
| author | Martin Polden <mpolden@mpolden.no> | 2022-03-02 14:33:14 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2022-03-02 14:37:50 +0100 |
| commit | 0c767ad0f3cdb31a749f9460d2cfb3de2319f3db (patch) | |
| tree | 510a1a261d9f895e4b7fa26ebf62a77d3de72ccb /vespa-osgi-testrunner | |
| parent | da1db1be992f3422b8a0755e11be921d8192e447 (diff) | |
Tell Vespa CLI when it's running inside Vespa Cloud
Diffstat (limited to 'vespa-osgi-testrunner')
| -rw-r--r-- | vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/VespaCliTestRunner.java | 4 | ||||
| -rw-r--r-- | vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/VespaCliTestRunnerTest.java | 3 |
2 files changed, 6 insertions, 1 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 c01286a8064..1ea7266ab12 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 @@ -26,7 +26,6 @@ import java.util.stream.Stream; import static com.yahoo.vespa.testrunner.TestRunner.Status.ERROR; import static com.yahoo.vespa.testrunner.TestRunner.Status.FAILURE; -import static com.yahoo.vespa.testrunner.TestRunner.Status.INCONCLUSIVE; import static com.yahoo.vespa.testrunner.TestRunner.Status.NO_TESTS; import static com.yahoo.vespa.testrunner.TestRunner.Status.RUNNING; import static com.yahoo.vespa.testrunner.TestRunner.Status.SUCCESS; @@ -119,6 +118,9 @@ public class VespaCliTestRunner implements TestRunner { "--zone", config.zone().value(), "--target", "cloud"); 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"); + builder.environment().put("VESPA_CLI_CLOUD_CI", "true"); builder.environment().put("VESPA_CLI_HOME", ensureHomeDirectoryForVespaCli().toString()); builder.environment().put("VESPA_CLI_ENDPOINTS", toEndpointsConfig(config)); builder.environment().put("VESPA_CLI_DATA_PLANE_KEY_FILE", artifactsPath.resolve("key").toAbsolutePath().toString()); 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 5fd73bb4494..8b02575b950 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 @@ -12,6 +12,7 @@ import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jonmv @@ -55,6 +56,8 @@ class VespaCliTestRunnerTest { "--zone", "dev.aws-us-east-1c", "--target", "cloud"), builder.command()); + assertTrue(builder.environment().containsKey("CI")); + assertTrue(builder.environment().containsKey("VESPA_CLI_CLOUD_CI")); assertEquals("{\"endpoints\":[{\"cluster\":\"default\",\"url\":\"https://dev.endpoint:443/\"}]}", builder.environment().get("VESPA_CLI_ENDPOINTS")); assertEquals(artifacts.resolve("key").toAbsolutePath().toString(), |