diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-09-21 16:26:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-21 16:26:49 +0200 |
| commit | d9db475220d68a54ba2c9f820d3bae78f80abd96 (patch) | |
| tree | 6a2d2dad80f920d4655dc33169292516f95e0abc /config-model/src/test | |
| parent | 5e08068fa0c7def183cf94b659e7d6fdb5ec1297 (diff) | |
| parent | d4b24bb3de4b75fdf7ac235d38d7bfa8b4c01fe8 (diff) | |
Merge pull request #24159 from vespa-engine/arnej/container-env-via-sentinel-config
pass container environment variables via new mechanism also
Diffstat (limited to 'config-model/src/test')
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java index 4d9bd978883..272dfa19f64 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java @@ -513,16 +513,17 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { " <nodes>", " <environment-variables>", " <KMP_SETTING>1</KMP_SETTING>", + " <valid_name>some value</valid_name>", " <KMP_AFFINITY>granularity=fine,verbose,compact,1,0</KMP_AFFINITY>", " </environment-variables>", " <node hostalias='mockhost'/>", " </nodes>", "</container>"); createModel(root, clusterElem); - QrStartConfig.Builder qrStartBuilder = new QrStartConfig.Builder(); - root.getConfig(qrStartBuilder, "container/container.0"); - QrStartConfig qrStartConfig = new QrStartConfig(qrStartBuilder); - assertEquals("KMP_SETTING=1 KMP_AFFINITY=granularity=fine,verbose,compact,1,0 ", qrStartConfig.qrs().env()); + var container = (AbstractService) root.getProducer("container/container.0"); + var env = container.getEnvVars(); + assertEquals("1", env.get("KMP_SETTING")); + assertEquals("granularity=fine,verbose,compact,1,0", env.get("KMP_AFFINITY")); } private void verifyAvailableprocessors(boolean isHosted, Flavor flavor, int expectProcessors) { |