Distro CLI: Add integration tests and test topology

- Add device_integration_test.py with end-to-end update tests
- Add test topology infrastructure with start.sh script
- Add integration test data (manifest, build scripts, dummy artifacts)
- Update update_service.sh to resolve symlinks for systemd RootDirectory

This completes the device update feature with integration testing.

Author: raghav-nexthop

cmake/FbossImageDistroCliTests.cmake

@@ -29,11 +29,16 @@ list(FILTER DISTRO_CLI_TEST_SOURCES EXCLUDE REGEX "image_builder_test\\.py$")
 list(FILTER DISTRO_CLI_TEST_SOURCES EXCLUDE REGEX "kernel_build_test\\.py$")
 list(FILTER DISTRO_CLI_TEST_SOURCES EXCLUDE REGEX "sai_build_test\\.py$")
 
-# Exclude: Docker not available
+# Exclude: Docker not available in standard builds
 list(FILTER DISTRO_CLI_TEST_SOURCES EXCLUDE REGEX "build_entrypoint_test\\.py$")
 list(FILTER DISTRO_CLI_TEST_SOURCES EXCLUDE REGEX "build_test\\.py$")
 list(FILTER DISTRO_CLI_TEST_SOURCES EXCLUDE REGEX "docker_test\\.py$")
 
+# Separate integration tests (require Docker) from unit tests
+file(GLOB DISTRO_CLI_INTEGRATION_TEST_SOURCES
+  "fboss-image/distro_cli/tests/device_integration_test.py"
+)
+
 file(GLOB DISTRO_CLI_TEST_HELPERS
   "fboss-image/distro_cli/tests/test_helpers.py"
 )
@@ -45,7 +50,7 @@ file(GLOB_RECURSE DISTRO_CLI_LIB_SOURCES
   "fboss-image/distro_cli/tools/*.py"
 )
 
-# Create Python unittest executable with test data files
+# Create Python unittest executable for unit tests
 # Use TYPE "dir" to create a directory-based executable instead of zipapp.
 # This allows tests to access data files via Path(__file__).parent, which
 # doesn't work inside zip archives.
@@ -64,6 +69,8 @@ add_fb_python_unittest(
     ${DISTRO_CLI_LIB_SOURCES}
   ENV
     "PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}/fboss-image"
+  PROPERTIES
+    LABELS "unit"
 )
 
 # Copy test data files AFTER the build generates the directory structure
@@ -100,6 +107,73 @@ add_custom_command(
 
 install_fb_python_executable(distro_cli_tests)
 
+# Create Python unittest executable for integration tests (require Docker)
+# These tests are labeled "integration" and "docker" so they can be run separately
+# Run with: ctest -L integration
+if(DISTRO_CLI_INTEGRATION_TEST_SOURCES)
+  add_fb_python_unittest(
+    distro_cli_integration_tests
+    BASE_DIR "fboss-image"
+    TYPE "dir"
+    SOURCES
+      ${DISTRO_CLI_INTEGRATION_TEST_SOURCES}
+      ${DISTRO_CLI_TEST_HELPERS}
+      ${DISTRO_CLI_LIB_SOURCES}
+    ENV
+      "PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}/fboss-image"
+    PROPERTIES
+      LABELS "integration;docker"
+  )
+
+  # Copy test data files for integration tests
+  set(INTEGRATION_DATA_DEST_DIR "${CMAKE_CURRENT_BINARY_DIR}/distro_cli_integration_tests/distro_cli/tests")
+  add_custom_command(
+    TARGET distro_cli_integration_tests.GEN_PY_EXE
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_directory
+            "${DATA_SOURCE_DIR}"
+            "${INTEGRATION_DATA_DEST_DIR}/data"
+    COMMENT "Copying test data files for distro_cli_integration_tests"
+  )
+
+  # Copy scripts directory for integration tests
+  set(INTEGRATION_SCRIPTS_DEST_DIR "${CMAKE_CURRENT_BINARY_DIR}/distro_cli_integration_tests/distro_cli/scripts")
+  add_custom_command(
+    TARGET distro_cli_integration_tests.GEN_PY_EXE
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_directory
+            "${SCRIPTS_SOURCE_DIR}"
+            "${INTEGRATION_SCRIPTS_DEST_DIR}"
+    COMMENT "Copying scripts for distro_cli_integration_tests"
+  )
+
+  # Copy proxy_device directory for integration tests
+  set(PROXY_DEVICE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/fboss-image/distro_cli/tests/proxy_device")
+  set(PROXY_DEVICE_DEST_DIR "${CMAKE_CURRENT_BINARY_DIR}/distro_cli_integration_tests/distro_cli/tests/proxy_device")
+  add_custom_command(
+    TARGET distro_cli_integration_tests.GEN_PY_EXE
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_directory
+            "${PROXY_DEVICE_SOURCE_DIR}"
+            "${PROXY_DEVICE_DEST_DIR}"
+    COMMENT "Copying proxy_device for distro_cli_integration_tests"
+  )
+
+  # Copy test_topology directory for integration tests
+  set(TEST_TOPOLOGY_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/fboss-image/distro_cli/tests/test_topology")
+  set(TEST_TOPOLOGY_DEST_DIR "${CMAKE_CURRENT_BINARY_DIR}/distro_cli_integration_tests/distro_cli/tests/test_topology")
+  add_custom_command(
+    TARGET distro_cli_integration_tests.GEN_PY_EXE
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_directory
+            "${TEST_TOPOLOGY_SOURCE_DIR}"
+            "${TEST_TOPOLOGY_DEST_DIR}"
+    COMMENT "Copying test_topology for distro_cli_integration_tests"
+  )
+
+  install_fb_python_executable(distro_cli_integration_tests)
+endif()
+
 # Restore the original Python3_EXECUTABLE if it was set
 if(DEFINED SAVED_Python3_EXECUTABLE)
   set(Python3_EXECUTABLE "${SAVED_Python3_EXECUTABLE}")

fboss-image/distro_cli/scripts/update_service.sh

@@ -22,8 +22,9 @@ SERVICES="$*"
 
 SCRIPT_DIR=$(dirname "$(readlink -f "$0")")
 TIMESTAMP=$(date +%s)
-BASE_SNAPSHOT="/distro-base"
-UPDATES_DIR="/updates"
+# Resolve symlinks to real paths (needed for systemd RootDirectory which doesn't follow symlinks)
+BASE_SNAPSHOT="$(readlink -f /distro-base)"
+UPDATES_DIR="$(readlink -f /updates)"
 
 echo "Updating component: ${COMPONENT}"
 echo "Services to restart: ${SERVICES}"