Skip to content

Commit 30a2d01

Browse files
[Test] Use AVAILABLE_AMIS_OSS_X86 instead of common.OSS_COMMERCIAL_X86 for multi nics test
This avoids false failure when AMIs are not available Signed-off-by: Hanwen <[email protected]>
1 parent a7e23b2 commit 30a2d01

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

tests/integration-tests/configs/develop.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ test-suites:
334334
dimensions:
335335
- regions: ["use1-az1"]
336336
instances: ["c6in.32xlarge"]
337-
oss: {{ common.OSS_COMMERCIAL_X86 }}
337+
oss: {{ AVAILABLE_AMIS_OSS_X86 }}
338338
schedulers: ["slurm"]
339339
networking:
340340
test_cluster_networking.py::test_cluster_in_private_subnet:

tests/integration-tests/framework/tests_configuration/config_renderer.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import logging
1313
import os
1414
from datetime import date
15-
from functools import lru_cache
1615

1716
import yaml
1817
from jinja2 import FileSystemLoader
@@ -31,7 +30,7 @@ def _get_os_parameters(config=None, args=None):
3130
"""
3231
available_amis_oss_x86 = _get_available_amis_oss("x86", config=config, args=args)
3332
available_amis_oss_arm = _get_available_amis_oss("arm", config=config, args=args)
34-
result = {}
33+
result = {"AVAILABLE_AMIS_OSS_X86": available_amis_oss_x86, "AVAILABLE_AMIS_OSS_ARM": available_amis_oss_arm}
3534
today_number = (date.today() - date(2020, 1, 1)).days
3635
for index in range(len(SUPPORTED_OSES)):
3736
result[f"OS_X86_{index}"] = available_amis_oss_x86[(today_number + index) % len(available_amis_oss_x86)]
@@ -115,7 +114,6 @@ def dump_rendered_config_file(config):
115114
return yaml.dump(config, default_flow_style=False)
116115

117116

118-
@lru_cache(maxsize=None)
119117
def _render_config_file(config_file, **kwargs):
120118
"""
121119
Apply Jinja rendering to the specified config file.

0 commit comments

Comments
 (0)