[Nexthop] Integrate distro_cli unit tests into CMake

.github/workflows/distro_image_build.yml

@@ -18,6 +18,10 @@ jobs:
       - name: Run fboss-image build
         run: ./fboss-image/distro_cli/fboss-image build fboss-image/from_source.json
 
+      - name: Run distro_cli tests
+        run: |
+          docker exec ${USER}-fboss-image-builder ctest -R distro_cli -V
+
       - name: Cleanup
         if: always()
         run: |

CMakeLists.txt

@@ -1154,3 +1154,6 @@ if (GITHUB_ACTIONS_BUILD)
     fsdb_all_services
   )
 endif()
+
+# FBOSS Image Builder distro_cli tests
+include(cmake/FbossImageDistroCliTests.cmake)

cmake/FbossImageDistroCliTests.cmake

@@ -0,0 +1,36 @@
+# CMake to build and test fboss-image/distro_cli
+
+# In general, libraries and binaries in fboss/foo/bar are built by
+# cmake/FooBar.cmake
+
+include(FBPythonBinary)
+
+file(GLOB DISTRO_CLI_TEST_SOURCES
+  "fboss-image/distro_cli/tests/*_test.py"
+)
+
+file(GLOB DISTRO_CLI_TEST_HELPERS
+  "fboss-image/distro_cli/tests/test_helpers.py"
+)
+
+file(GLOB_RECURSE DISTRO_CLI_LIB_SOURCES
+  "fboss-image/distro_cli/builder/*.py"
+  "fboss-image/distro_cli/cmds/*.py"
+  "fboss-image/distro_cli/lib/*.py"
+  "fboss-image/distro_cli/tools/*.py"
+)
+
+file(COPY "fboss-image/distro_cli/tests/data" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/fboss-image/distro_cli/tests")
+
+add_fb_python_unittest(
+  distro_cli_tests
+  BASE_DIR "fboss-image"
+  SOURCES
+    ${DISTRO_CLI_TEST_SOURCES}
+    ${DISTRO_CLI_TEST_HELPERS}
+    ${DISTRO_CLI_LIB_SOURCES}
+  ENV
+    "PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}/fboss-image/distro_cli"
+)
+
+install_fb_python_executable(distro_cli_tests)

fboss-image/distro_cli/README.md

@@ -119,6 +119,16 @@ python3 -m unittest discover -s tests -p '*_test.py'
 python3 -m unittest tests.cli_test
 ```
 
+#### With CMake
+
+```bash
+# Build and run all tests
+cmake --build . --target distro_cli_tests
+
+# Run via CTest
+ctest -R distro_cli -V
+```
+
 ### Linting
 
 ```bash

fboss-image/kernel/configs/fboss-local-overrides.yaml

@@ -0,0 +1,51 @@
+# FBOSS Local Configuration Overrides
+#
+# Copyright (c) 2004-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+#
+# This file contains local overrides to the Meta fboss-reference.config
+# organized by common settings and kernel version-specific settings
+
+# Common overrides that apply to all kernel versions
+# Add config lines here
+common_overrides: |
+  # These changes disable settings in Meta reference config that don't exist in standard linux source
+  CONFIG_BOOT_CONFIG_EMBED_FILE=""
+  CONFIG_SYSTEM_TRUSTED_KEYS=""
+
+  # Drivers for Golden Eagle platform
+  CONFIG_EEPROM_AT24=m
+  CONFIG_SENSORS_TMP464=m
+  CONFIG_SENSORS_LM90=m
+  CONFIG_SENSORS_PMBUS=m
+  CONFIG_SENSORS_ADM1266=m
+  CONFIG_SENSORS_ISL68137=m
+  CONFIG_AD525X_DPOT=m
+  CONFIG_AD525X_DPOT_I2C=m
+  CONFIG_NET_VENDOR_AMD=y
+  CONFIG_AMD_XGBE=m
+  CONFIG_AMD_XGBE_DCB=y
+  CONFIG_AMD_XGBE_HAVE_ECC=y
+  CONFIG_X86_AMD_PLATFORM_DEVICE=y
+  CONFIG_I2C_DESIGNWARE_PLATFORM=y
+  CONFIG_I2C_DESIGNWARE_PCI=y
+  CONFIG_ACPI_SPCR_TABLE=y
+  CONFIG_SERIAL_8250_DW=m
+  CONFIG_SERIAL_8250_DWLIB=m
+  CONFIG_SERIAL_8250_PNP=y
+
+
+# Kernel version overrides
+# Add kernel version as key, then add config lines in the value
+kernel_version_overrides:
+  "6.4.3": |
+    # Specific overrides for kernel 6.4.3
+    # Add any 6.4.3-specific config lines here
+
+  "6.11.1": |
+    # Specific overrides for kernel 6.11.1
+    # Add any 6.11.1-specific config lines here