diff --git a/resources/tests/cpu_template_helper/fingerprint_AMD_MILAN_4.14host.json b/resources/tests/cpu_template_helper/fingerprint_AMD_MILAN_4.14host.json index 1fc5630a264..381726c208d 100644 --- a/resources/tests/cpu_template_helper/fingerprint_AMD_MILAN_4.14host.json +++ b/resources/tests/cpu_template_helper/fingerprint_AMD_MILAN_4.14host.json @@ -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": { @@ -1329,4 +1329,4 @@ } ] } -} +} \ No newline at end of file diff --git a/resources/tests/cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json b/resources/tests/cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json index e14f3f545e6..8cd5d62d0fe 100644 --- a/resources/tests/cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json +++ b/resources/tests/cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json @@ -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": { @@ -1495,4 +1495,4 @@ } ] } -} +} \ No newline at end of file diff --git a/resources/tests/cpu_template_helper/fingerprint_AMD_MILAN_6.1host.json b/resources/tests/cpu_template_helper/fingerprint_AMD_MILAN_6.1host.json index 713c6330934..41d6ae65975 100644 --- a/resources/tests/cpu_template_helper/fingerprint_AMD_MILAN_6.1host.json +++ b/resources/tests/cpu_template_helper/fingerprint_AMD_MILAN_6.1host.json @@ -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": { @@ -1545,4 +1545,4 @@ } ] } -} +} \ No newline at end of file diff --git a/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_4.14host.json b/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_4.14host.json index 1e75debe20f..e575ae89cc6 100644 --- a/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_4.14host.json +++ b/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_4.14host.json @@ -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", @@ -1048,4 +1048,4 @@ } ] } -} +} \ No newline at end of file diff --git a/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_5.10host.json b/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_5.10host.json index c9bfaa8a2d5..23c06a860f1 100644 --- a/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_5.10host.json +++ b/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_5.10host.json @@ -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", @@ -1252,4 +1252,4 @@ } ] } -} +} \ No newline at end of file diff --git a/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_6.1host.json b/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_6.1host.json index c75f5c70d6a..c0738adcd20 100644 --- a/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_6.1host.json +++ b/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_6.1host.json @@ -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", diff --git a/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_4.14host.json b/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_4.14host.json index 0dc75c5e06a..a57fc73c50c 100644 --- a/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_4.14host.json +++ b/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_4.14host.json @@ -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", @@ -1048,4 +1048,4 @@ } ] } -} +} \ No newline at end of file diff --git a/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_5.10host.json b/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_5.10host.json index 019ea61156c..7d5d11dd6df 100644 --- a/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_5.10host.json +++ b/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_5.10host.json @@ -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", @@ -1252,4 +1252,4 @@ } ] } -} +} \ No newline at end of file diff --git a/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_6.1host.json b/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_6.1host.json index 8ffe99b597b..fbcd594999e 100644 --- a/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_6.1host.json +++ b/resources/tests/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_6.1host.json @@ -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", @@ -972,4 +972,4 @@ } ] } -} +} \ No newline at end of file diff --git a/resources/tests/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_4.14host.json b/resources/tests/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_4.14host.json index 82d4896f9db..a374f199139 100644 --- a/resources/tests/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_4.14host.json +++ b/resources/tests/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_4.14host.json @@ -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": { @@ -931,7 +931,7 @@ }, { "addr": "0x10a", - "bitmap": "0b0000000000000000000000000000000000000000000000101010110001101011" + "bitmap": "0b0000000000000000000000000000000000000000000010101010110001101011" }, { "addr": "0x140", @@ -1011,4 +1011,4 @@ } ] } -} +} \ No newline at end of file diff --git a/resources/tests/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_5.10host.json b/resources/tests/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_5.10host.json index 3d67fef46be..82fb6df4c50 100644 --- a/resources/tests/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_5.10host.json +++ b/resources/tests/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_5.10host.json @@ -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": { @@ -1123,7 +1123,7 @@ }, { "addr": "0x10a", - "bitmap": "0b0000000000000000000000000000000000000000000000101010000011101011" + "bitmap": "0b0000000000000000000000000000000000000000000010101010000011101011" }, { "addr": "0x140", @@ -1223,4 +1223,4 @@ } ] } -} +} \ No newline at end of file diff --git a/resources/tests/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_6.1host.json b/resources/tests/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_6.1host.json index 85f00c4b997..b7c6904bb66 100644 --- a/resources/tests/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_6.1host.json +++ b/resources/tests/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_6.1host.json @@ -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": { @@ -1123,7 +1123,7 @@ }, { "addr": "0x10a", - "bitmap": "0b0000000000000000000000000000000000000000000000101010000011101011" + "bitmap": "0b0000000000000000000000000000000000000000000010101010000011101011" }, { "addr": "0x140", @@ -1223,4 +1223,4 @@ } ] } -} +} \ No newline at end of file diff --git a/resources/tests/cpu_template_helper/fingerprint_INTEL_ICELAKE_4.14host.json b/resources/tests/cpu_template_helper/fingerprint_INTEL_ICELAKE_4.14host.json index bea6f060916..1b10a337395 100644 --- a/resources/tests/cpu_template_helper/fingerprint_INTEL_ICELAKE_4.14host.json +++ b/resources/tests/cpu_template_helper/fingerprint_INTEL_ICELAKE_4.14host.json @@ -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": [ { @@ -961,4 +961,4 @@ } ] } -} +} \ No newline at end of file diff --git a/resources/tests/cpu_template_helper/fingerprint_INTEL_ICELAKE_5.10host.json b/resources/tests/cpu_template_helper/fingerprint_INTEL_ICELAKE_5.10host.json index 6b651061407..3146f827e78 100644 --- a/resources/tests/cpu_template_helper/fingerprint_INTEL_ICELAKE_5.10host.json +++ b/resources/tests/cpu_template_helper/fingerprint_INTEL_ICELAKE_5.10host.json @@ -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": { @@ -1311,4 +1311,4 @@ } ] } -} +} \ No newline at end of file diff --git a/resources/tests/cpu_template_helper/fingerprint_INTEL_ICELAKE_6.1host.json b/resources/tests/cpu_template_helper/fingerprint_INTEL_ICELAKE_6.1host.json index e534cd6c6ae..620ed4bfdbb 100644 --- a/resources/tests/cpu_template_helper/fingerprint_INTEL_ICELAKE_6.1host.json +++ b/resources/tests/cpu_template_helper/fingerprint_INTEL_ICELAKE_6.1host.json @@ -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": { @@ -1311,4 +1311,4 @@ } ] } -} +} \ No newline at end of file diff --git a/resources/tests/cpu_template_helper/fingerprint_INTEL_SKYLAKE_4.14host.json b/resources/tests/cpu_template_helper/fingerprint_INTEL_SKYLAKE_4.14host.json index 62dd3c57fa3..7b304265438 100644 --- a/resources/tests/cpu_template_helper/fingerprint_INTEL_SKYLAKE_4.14host.json +++ b/resources/tests/cpu_template_helper/fingerprint_INTEL_SKYLAKE_4.14host.json @@ -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": { @@ -1011,4 +1011,4 @@ } ] } -} +} \ No newline at end of file diff --git a/resources/tests/cpu_template_helper/fingerprint_INTEL_SKYLAKE_5.10host.json b/resources/tests/cpu_template_helper/fingerprint_INTEL_SKYLAKE_5.10host.json index 959c4996001..b6868763d78 100644 --- a/resources/tests/cpu_template_helper/fingerprint_INTEL_SKYLAKE_5.10host.json +++ b/resources/tests/cpu_template_helper/fingerprint_INTEL_SKYLAKE_5.10host.json @@ -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": { @@ -1223,4 +1223,4 @@ } ] } -} +} \ No newline at end of file diff --git a/resources/tests/cpu_template_helper/fingerprint_INTEL_SKYLAKE_6.1host.json b/resources/tests/cpu_template_helper/fingerprint_INTEL_SKYLAKE_6.1host.json index 5fe9da50588..81e17987194 100644 --- a/resources/tests/cpu_template_helper/fingerprint_INTEL_SKYLAKE_6.1host.json +++ b/resources/tests/cpu_template_helper/fingerprint_INTEL_SKYLAKE_6.1host.json @@ -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": { @@ -1223,4 +1223,4 @@ } ] } -} +} \ No newline at end of file diff --git a/tests/integration_tests/functional/test_cpu_template_helper.py b/tests/integration_tests/functional/test_cpu_template_helper.py index 27288e3328a..aa1b12bec88 100644 --- a/tests/integration_tests/functional/test_cpu_template_helper.py +++ b/tests/integration_tests/functional/test_cpu_template_helper.py @@ -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) diff --git a/tools/devtool b/tools/devtool index fc57482eac4..c8bd8cf2ca1 100755 --- a/tools/devtool +++ b/tools/devtool @@ -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 @@ -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