ci: replace c7g with m7g

And try to handle both generically by the CPU in tests, rather than
depending on a particular instance type.

Signed-off-by: Pablo Barbáchano <pablob@amazon.com>

Author: pb8o

.buildkite/common.py

@@ -15,7 +15,7 @@
     "m6i.metal",
     "m6a.metal",
     "m6g.metal",
-    "c7g.metal",
+    "m7g.metal",
 ]
 
 DEFAULT_PLATFORMS = [

.buildkite/pipeline_pr.py

@@ -38,7 +38,7 @@
 defaults = overlay_dict(defaults, args.step_param)
 
 defaults_once_per_architecture = defaults.copy()
-defaults_once_per_architecture["instances"] = ["m6i.metal", "c7g.metal"]
+defaults_once_per_architecture["instances"] = ["m6i.metal", "m7g.metal"]
 defaults_once_per_architecture["platforms"] = [("al2", "linux_5.10")]
 
 

README.md

@@ -136,7 +136,7 @@ We test all combinations of:
 | m6i.metal | al2    linux_5.10 |              | linux_5.10   |
 | m6a.metal | al2023 linux_6.1  |              |              |
 | m6g.metal |                   |              |              |
-| c7g.metal |                   |              |              |
+| m7g.metal |                   |              |              |
 
 ## Known issues and Limitations
 

tests/integration_tests/functional/test_rng.py

@@ -7,8 +7,12 @@
 from framework.properties import global_props
 from framework.utils import check_entropy
 
-if global_props.instance == "c7g.metal" and global_props.host_linux_version == "4.14":
-    pytestmark = pytest.mark.skip(reason="c7g requires no SVE 5.10 kernel")
+if (
+    global_props.cpu_model == "ARM_NEOVERSE_V1"
+    and global_props.host_linux_version == "4.14"
+):
+    # Graviton3 instances in 4.14 require a non-SVE kernel to boot
+    pytestmark = pytest.mark.skip(reason="[cm]7g requires non-SVE 5.10 kernel")
 
 
 @pytest.fixture(params=[None])

tests/integration_tests/security/test_vulnerabilities.py

@@ -29,6 +29,14 @@
 VULN_DIR = "/sys/devices/system/cpu/vulnerabilities"
 
 
+skip_if_g3_on_linux_4_14 = pytest.mark.skipif(
+    global_props.cpu_model == "ARM_NEOVERSE_V1"
+    and global_props.host_linux_version == "4.14",
+    # Graviton3 instances in 4.14 require a non-SVE kernel to boot
+    reason="[cm]7g 4.14 requires modifications to the 5.10 guest kernel to boot successfully.",
+)
+
+
 def configure_microvm(
     factory,
     kernel,
@@ -211,10 +219,7 @@ def check_vulnerabilities_on_guest(status):
     assert report_guest_vulnerabilities == known_guest_vulnerabilities
 
 
-@pytest.mark.skipif(
-    global_props.instance == "c7g.metal" and global_props.host_linux_version == "4.14",
-    reason="c7g host 4.14 requires modifications to the 5.10 guest kernel to boot successfully.",
-)
+@skip_if_g3_on_linux_4_14
 def test_spectre_meltdown_checker_on_host(spectre_meltdown_checker):
     """
     Test with the spectre / meltdown checker on host.
@@ -249,10 +254,7 @@ def test_spectre_meltdown_checker_on_host(spectre_meltdown_checker):
         assert report == expected, f"Unexpected vulnerabilities: {report} vs {expected}"
 
 
-@pytest.mark.skipif(
-    global_props.instance == "c7g.metal" and global_props.host_linux_version == "4.14",
-    reason="c7g host 4.14 requires modifications to the 5.10 guest kernel to boot successfully.",
-)
+@skip_if_g3_on_linux_4_14
 def test_spectre_meltdown_checker_on_guest(spectre_meltdown_checker, build_microvm):
     """
     Test with the spectre / meltdown checker on guest.
@@ -270,10 +272,7 @@ def test_spectre_meltdown_checker_on_guest(spectre_meltdown_checker, build_micro
         check_vulnerabilities_on_guest(status)
 
 
-@pytest.mark.skipif(
-    global_props.instance == "c7g.metal" and global_props.host_linux_version == "4.14",
-    reason="c7g host 4.14 requires modifications to the 5.10 guest kernel to boot successfully.",
-)
+@skip_if_g3_on_linux_4_14
 def test_spectre_meltdown_checker_on_restored_guest(
     spectre_meltdown_checker, build_microvm, microvm_factory
 ):
@@ -294,10 +293,7 @@ def test_spectre_meltdown_checker_on_restored_guest(
         check_vulnerabilities_on_guest(status)
 
 
-@pytest.mark.skipif(
-    global_props.instance == "c7g.metal" and global_props.host_linux_version == "4.14",
-    reason="c7g host 4.14 requires modifications to the 5.10 guest kernel to boot successfully.",
-)
+@skip_if_g3_on_linux_4_14
 def test_spectre_meltdown_checker_on_guest_with_template(
     spectre_meltdown_checker, build_microvm_with_template
 ):
@@ -314,10 +310,7 @@ def test_spectre_meltdown_checker_on_guest_with_template(
     )
 
 
-@pytest.mark.skipif(
-    global_props.instance == "c7g.metal" and global_props.host_linux_version == "4.14",
-    reason="c7g host 4.14 requires modifications to the 5.10 guest kernel to boot successfully.",
-)
+@skip_if_g3_on_linux_4_14
 def test_spectre_meltdown_checker_on_guest_with_custom_template(
     spectre_meltdown_checker, build_microvm_with_custom_template
 ):
@@ -333,10 +326,7 @@ def test_spectre_meltdown_checker_on_guest_with_custom_template(
     )
 
 
-@pytest.mark.skipif(
-    global_props.instance == "c7g.metal" and global_props.host_linux_version == "4.14",
-    reason="c7g host 4.14 requires modifications to the 5.10 guest kernel to boot successfully.",
-)
+@skip_if_g3_on_linux_4_14
 def test_spectre_meltdown_checker_on_restored_guest_with_template(
     spectre_meltdown_checker, build_microvm_with_template, microvm_factory
 ):
@@ -355,10 +345,7 @@ def test_spectre_meltdown_checker_on_restored_guest_with_template(
     )
 
 
-@pytest.mark.skipif(
-    global_props.instance == "c7g.metal" and global_props.host_linux_version == "4.14",
-    reason="c7g host 4.14 requires modifications to the 5.10 guest kernel to boot successfully.",
-)
+@skip_if_g3_on_linux_4_14
 def test_spectre_meltdown_checker_on_restored_guest_with_custom_template(
     spectre_meltdown_checker,
     build_microvm_with_custom_template,