Skip to content

chore(test): Update fingerprint baselines #3813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 12, 2023
Merged

chore(test): Update fingerprint baselines #3813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aeac021
chore(tool): Show CPU info before running test
zulinx86 Jun 9, 2023
2b06541
fix(test): Add a missing dash
zulinx86 Jun 9, 2023
3448575
chore(test): Update fingerprint baselines
zulinx86 Jun 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions resources/tests/cpu_template_helper/fingerprint_AMD_MILAN_4.14host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"firecracker_version": "1.5.0-dev",
"kernel_version": "4.14.313-235.533.amzn2.x86_64",
"microcode_version": "0xa001173",
"kernel_version": "4.14.314-238.539.amzn2.x86_64",
"microcode_version": "0xa0011a9",
"bios_version": "1.0",
"bios_revision": "5.22",
"guest_cpu_config": {
Expand Down Expand Up @@ -1329,4 +1329,4 @@
}
]
}
}
}
6 changes: 3 additions & 3 deletions resources/tests/cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"firecracker_version": "1.5.0-dev",
"kernel_version": "5.10.178-162.673.amzn2.x86_64",
"microcode_version": "0xa001173",
"kernel_version": "5.10.179-168.710.amzn2.x86_64",
"microcode_version": "0xa0011a9",
"bios_version": "1.0",
"bios_revision": "5.22",
"guest_cpu_config": {
Expand Down Expand Up @@ -1495,4 +1495,4 @@
}
]
}
}
}
6 changes: 3 additions & 3 deletions resources/tests/cpu_template_helper/fingerprint_AMD_MILAN_6.1host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"firecracker_version": "1.5.0-dev",
"kernel_version": "6.1.25-37.47.amzn2023.x86_64",
"microcode_version": "0xa001173",
"kernel_version": "6.1.29-47.49.amzn2023.x86_64",
"microcode_version": "0xa0011a9",
"bios_version": "1.0",
"bios_revision": "5.22",
"guest_cpu_config": {
Expand Down Expand Up @@ -1545,4 +1545,4 @@
}
]
}
}
}
4 changes: 2 additions & 2 deletions resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_4.14host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"firecracker_version": "1.5.0-dev",
"kernel_version": "4.14.313-235.533.amzn2.aarch64",
"kernel_version": "4.14.314-238.539.amzn2.aarch64",
"microcode_version": "0x00000000000000ff",
"bios_version": "1.0",
"bios_revision": "1.0",
Expand Down Expand Up @@ -1048,4 +1048,4 @@
}
]
}
}
}
4 changes: 2 additions & 2 deletions resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_5.10host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"firecracker_version": "1.5.0-dev",
"kernel_version": "5.10.178-162.673.amzn2.aarch64",
"kernel_version": "5.10.179-168.710.amzn2.aarch64",
"microcode_version": "0x00000000000000ff",
"bios_version": "1.0",
"bios_revision": "1.0",
Expand Down Expand Up @@ -1252,4 +1252,4 @@
}
]
}
}
}
2 changes: 1 addition & 1 deletion resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_6.1host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"firecracker_version": "1.5.0-dev",
"kernel_version": "6.1.25-37.47.amzn2023.aarch64",
"kernel_version": "6.1.29-47.49.amzn2023.aarch64",
"microcode_version": "0x00000000000000ff",
"bios_version": "1.0",
"bios_revision": "1.0",
Expand Down
4 changes: 2 additions & 2 deletions resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_4.14host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"firecracker_version": "1.5.0-dev",
"kernel_version": "4.14.313-235.533.amzn2.aarch64",
"kernel_version": "4.14.314-238.539.amzn2.aarch64",
"microcode_version": "0x0000000000000001",
"bios_version": "1.0",
"bios_revision": "1.0",
Expand Down Expand Up @@ -1048,4 +1048,4 @@
}
]
}
}
}
4 changes: 2 additions & 2 deletions resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_5.10host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"firecracker_version": "1.5.0-dev",
"kernel_version": "5.10.178-162.673.amzn2.aarch64",
"kernel_version": "5.10.179-168.710.amzn2.aarch64",
"microcode_version": "0x0000000000000001",
"bios_version": "1.0",
"bios_revision": "1.0",
Expand Down Expand Up @@ -1252,4 +1252,4 @@
}
]
}
}
}
4 changes: 2 additions & 2 deletions resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_6.1host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"firecracker_version": "1.5.0-dev",
"kernel_version": "6.1.25-37.47.amzn2023.aarch64",
"kernel_version": "6.1.29-47.49.amzn2023.aarch64",
"microcode_version": "0x0000000000000001",
"bios_version": "1.0",
"bios_revision": "1.0",
Expand Down Expand Up @@ -972,4 +972,4 @@
}
]
}
}
}
8 changes: 4 additions & 4 deletions resources/tests/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_4.14host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"firecracker_version": "1.5.0-dev",
"kernel_version": "4.14.313-235.533.amzn2.x86_64",
"microcode_version": "0x5003302",
"kernel_version": "4.14.314-238.539.amzn2.x86_64",
"microcode_version": "0x5003501",
"bios_version": "1.0",
"bios_revision": "3.65",
"guest_cpu_config": {
Expand Down Expand Up @@ -931,7 +931,7 @@
},
{
"addr": "0x10a",
"bitmap": "0b0000000000000000000000000000000000000000000000101010110001101011"
"bitmap": "0b0000000000000000000000000000000000000000000010101010110001101011"
},
{
"addr": "0x140",
Expand Down Expand Up @@ -1011,4 +1011,4 @@
}
]
}
}
}
8 changes: 4 additions & 4 deletions resources/tests/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_5.10host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"firecracker_version": "1.5.0-dev",
"kernel_version": "5.10.178-162.673.amzn2.x86_64",
"microcode_version": "0x5003302",
"kernel_version": "5.10.179-168.710.amzn2.x86_64",
"microcode_version": "0x5003501",
"bios_version": "1.0",
"bios_revision": "3.65",
"guest_cpu_config": {
Expand Down Expand Up @@ -1123,7 +1123,7 @@
},
{
"addr": "0x10a",
"bitmap": "0b0000000000000000000000000000000000000000000000101010000011101011"
"bitmap": "0b0000000000000000000000000000000000000000000010101010000011101011"
},
{
"addr": "0x140",
Expand Down Expand Up @@ -1223,4 +1223,4 @@
}
]
}
}
}
8 changes: 4 additions & 4 deletions resources/tests/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_6.1host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"firecracker_version": "1.5.0-dev",
"kernel_version": "6.1.25-37.47.amzn2023.x86_64",
"microcode_version": "0x5003302",
"kernel_version": "6.1.29-47.49.amzn2023.x86_64",
"microcode_version": "0x5003501",
"bios_version": "1.0",
"bios_revision": "3.65",
"guest_cpu_config": {
Expand Down Expand Up @@ -1123,7 +1123,7 @@
},
{
"addr": "0x10a",
"bitmap": "0b0000000000000000000000000000000000000000000000101010000011101011"
"bitmap": "0b0000000000000000000000000000000000000000000010101010000011101011"
},
{
"addr": "0x140",
Expand Down Expand Up @@ -1223,4 +1223,4 @@
}
]
}
}
}
8 changes: 4 additions & 4 deletions resources/tests/cpu_template_helper/fingerprint_INTEL_ICELAKE_4.14host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"firecracker_version": "1.5.0-dev",
"kernel_version": "4.14.313-235.533.amzn2.x86_64",
"microcode_version": "0xd00037b",
"kernel_version": "4.14.314-238.539.amzn2.x86_64",
"microcode_version": "0xd000390",
"bios_version": "1.0",
"bios_revision": "1.25",
"bios_revision": "1.29",
"guest_cpu_config": {
"cpuid_modifiers": [
{
Expand Down Expand Up @@ -961,4 +961,4 @@
}
]
}
}
}
6 changes: 3 additions & 3 deletions resources/tests/cpu_template_helper/fingerprint_INTEL_ICELAKE_5.10host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"firecracker_version": "1.5.0-dev",
"kernel_version": "5.10.178-162.673.amzn2.x86_64",
"microcode_version": "0xd00037b",
"kernel_version": "5.10.179-168.710.amzn2.x86_64",
"microcode_version": "0xd000390",
"bios_version": "1.0",
"bios_revision": "1.25",
"guest_cpu_config": {
Expand Down Expand Up @@ -1311,4 +1311,4 @@
}
]
}
}
}
6 changes: 3 additions & 3 deletions resources/tests/cpu_template_helper/fingerprint_INTEL_ICELAKE_6.1host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"firecracker_version": "1.5.0-dev",
"kernel_version": "6.1.25-37.47.amzn2023.x86_64",
"microcode_version": "0xd00037b",
"kernel_version": "6.1.29-47.49.amzn2023.x86_64",
"microcode_version": "0xd000390",
"bios_version": "1.0",
"bios_revision": "1.25",
"guest_cpu_config": {
Expand Down Expand Up @@ -1311,4 +1311,4 @@
}
]
}
}
}
6 changes: 3 additions & 3 deletions resources/tests/cpu_template_helper/fingerprint_INTEL_SKYLAKE_4.14host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"firecracker_version": "1.5.0-dev",
"kernel_version": "4.14.313-235.533.amzn2.x86_64",
"microcode_version": "0x2006e05",
"kernel_version": "4.14.314-238.539.amzn2.x86_64",
"microcode_version": "0x2006f05",
"bios_version": "1.0",
"bios_revision": "3.65",
"guest_cpu_config": {
Expand Down Expand Up @@ -1011,4 +1011,4 @@
}
]
}
}
}
6 changes: 3 additions & 3 deletions resources/tests/cpu_template_helper/fingerprint_INTEL_SKYLAKE_5.10host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"firecracker_version": "1.5.0-dev",
"kernel_version": "5.10.178-162.673.amzn2.x86_64",
"microcode_version": "0x2006e05",
"kernel_version": "5.10.179-168.710.amzn2.x86_64",
"microcode_version": "0x2006f05",
"bios_version": "1.0",
"bios_revision": "3.65",
"guest_cpu_config": {
Expand Down Expand Up @@ -1223,4 +1223,4 @@
}
]
}
}
}
6 changes: 3 additions & 3 deletions resources/tests/cpu_template_helper/fingerprint_INTEL_SKYLAKE_6.1host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"firecracker_version": "1.5.0-dev",
"kernel_version": "6.1.25-37.47.amzn2023.x86_64",
"microcode_version": "0x2006e05",
"kernel_version": "6.1.29-47.49.amzn2023.x86_64",
"microcode_version": "0x2006f05",
"bios_version": "1.0",
"bios_revision": "3.65",
"guest_cpu_config": {
Expand Down Expand Up @@ -1223,4 +1223,4 @@
}
]
}
}
}
2 changes: 1 addition & 1 deletion tests/integration_tests/functional/test_cpu_template_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def fingerprint_compare(
"""Compare two fingerprint files"""
cmd = (
f"{self.BINARY_PATH} fingerprint compare"
f" --prev {prev_path} -curr {curr_path}"
f" --prev {prev_path} --curr {curr_path}"
f" --filters {' '.join(filters)}"
)
utils.run_cmd(cmd)
Expand Down
4 changes: 1 addition & 3 deletions tools/devtool
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,7 @@ cmd_test() {

# If we got to here, we've got all we need to continue.
say "Kernel version: $(uname -r)"
say "$(lscpu)"
say "Starting test run ..."

if [[ $ramdisk = true ]]; then
Expand Down Expand Up @@ -631,9 +632,6 @@ cmd_test() {
# dir. Let's fix that.
cmd_fix_perms

# Log CPU information
say "$(lscpu)"

# do not leave behind env.list file
rm env.list

Expand Down