Skip to content

Commit 9d2ff4a

Browse files
committed
chore: Rename dir name for custom CPU templates
At that time of creating the directory, there are only custom CPU templates corresponding to static CPU templates. But now there is a CPU template that doesn't have a corresponding static CPU template (i.e. aarch64_with_sve_and_pac.json), there is no longer sense to name the dir "static_cpu_templates". Signed-off-by: Takahiro Itazuri <itazur@amazon.com>
1 parent 2c8b050 commit 9d2ff4a

File tree

11 files changed

+4
-4
lines changed

11 files changed

+4
-4
lines changed

src/vmm/src/cpu_config/test_utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use crate::cpu_config::templates::CustomCpuTemplate;
99
pub fn get_json_template(filename: &str) -> CustomCpuTemplate {
1010
let json_path = [
1111
env!("CARGO_MANIFEST_DIR"),
12-
"../../tests/data/static_cpu_templates",
12+
"../../tests/data/custom_cpu_templates",
1313
filename,
1414
]
1515
.iter()

tests/framework/utils_cpu_templates.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def get_supported_custom_cpu_templates():
6969
def custom_cpu_templates_params():
7070
"""Return Custom CPU templates as pytest parameters"""
7171
for name in sorted(get_supported_custom_cpu_templates()):
72-
tmpl = Path(f"./data/static_cpu_templates/{name.lower()}.json")
72+
tmpl = Path(f"./data/custom_cpu_templates/{name.lower()}.json")
7373
yield pytest.param(
7474
{"name": name, "template": json.loads(tmpl.read_text("utf-8"))},
7575
id="custom_" + name,

tools/gh_release.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def build_tarball(release_dir, release_tgz, arch):
2626
exclude_files = {
2727
"RELEASE_NOTES",
2828
"SHA256SUMS.sig",
29-
*[f.stem for f in Path("tests/data/static_cpu_templates").glob("*.json")],
29+
*[f.stem for f in Path("tests/data/custom_cpu_templates").glob("*.json")],
3030
}
3131
with tarfile.open(release_tgz, "w:gz") as tar:
3232
files = [x for x in release_dir.rglob("*") if x.is_file()]

tools/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ cp -v src/firecracker/swagger/firecracker.yaml "$RELEASE_DIR/firecracker_spec-$V
179179

180180
CPU_TEMPLATES=(c3 t2 t2s t2cl t2a v1n1)
181181
for template in "${CPU_TEMPLATES[@]}"; do
182-
cp -v tests/data/static_cpu_templates/$template.json $RELEASE_DIR/$template-$VERSION.json
182+
cp -v tests/data/custom_cpu_templates/$template.json $RELEASE_DIR/$template-$VERSION.json
183183
done
184184

185185
(

0 commit comments

Comments
 (0)