Split unit tests

Signed-off-by: sougata-progress <sougatab@progress.com>

Author: sougata-progress

.expeditor/scripts/verify/run_cargo_test.sh

@@ -2,17 +2,12 @@
 
 set -eou pipefail
 
-# Platform-specific setup before sourcing shared.sh
+# Set up writable HAB_ROOT_PATH on macOS BEFORE sourcing shared.sh to avoid read-only filesystem issues
 if [[ "$OSTYPE" == "darwin"* ]]; then
-  # Set up temporary HAB_ROOT_PATH for macOS to avoid permission issues
   export HAB_ROOT_PATH
   HAB_ROOT_PATH=$(mktemp -d /tmp/hab-root-XXXXXX)
-  
   # Clean up Darwin-specific temp directory on exit
   trap 'rm -rf "$HAB_ROOT_PATH"' EXIT
-  
-  # Accept habitat license via environment variable to avoid sudo issues
-  export HAB_LICENSE="accept-no-persist"
 fi
 
 # shellcheck source=.expeditor/scripts/shared.sh
@@ -50,15 +45,37 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
     brew install coreutils gnu-tar
   fi
 
+  # Install hab and bootstrap package for certificate extraction
+  if ! command -v hab &> /dev/null; then
+    echo "Installing hab via curlbash..."
+    curlbash_hab "x86_64-darwin"
+  fi
+  
+  echo "Installing bootstrap package for GNU tools..."
+  macos_install_bootstrap_package
+  
+  # Accept habitat license after hab is installed and HAB_ROOT_PATH is set
+  sudo -E hab license accept
+  
   # Set up certificate file for TLS tests using macOS approach
-  # Temporarily add GNU tools to PATH for the certificate function
+  # Temporarily modify PATH to prioritize GNU tools over BSD tools
   brew_prefix=$(brew --prefix)
-  export PATH="/usr/local/bin:${brew_prefix}/bin:$PATH"
-  # Create aliases for the certificate extraction function
-  alias tail=gtail
-  alias tar=gtar
+  gnu_coreutils_bin="${brew_prefix}/bin"
+  gnu_tar_bin="${brew_prefix}/bin"
+  original_PATH="$PATH"
+  export PATH="${gnu_coreutils_bin}:${gnu_tar_bin}:$PATH"
+  
+  # Create symlinks for the certificate extraction function
+  temp_bin_dir=$(mktemp -d)
+  ln -s "${brew_prefix}/bin/gtail" "${temp_bin_dir}/tail"
+  ln -s "${brew_prefix}/bin/gtar" "${temp_bin_dir}/tar" 
+  export PATH="${temp_bin_dir}:$PATH"
+  
   macos_use_cert_file_from_linux_cacerts_package
-  unalias tail tar
+  
+  # Restore original PATH and cleanup
+  export PATH="$original_PATH"
+  rm -rf "$temp_bin_dir"
 
   install_rustup
   install_rust_toolchain "$toolchain"
@@ -71,6 +88,9 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 else
   echo "--- Setting up Linux environment"
 
+  # Accept habitat license
+  sudo -E hab license accept
+  
   # TODO: these should be in a shared script?
   sudo -E hab pkg install core/zeromq
   sudo -E hab pkg install core/protobuf

.expeditor/scripts/verify/shared.sh

@@ -6,13 +6,17 @@ source .expeditor/scripts/shared.sh
 
 # This script should contain all shared functions for the verify pipeline
 
-# Always accept habitat license
-if [[ -z "${HAB_LICENSE:-}" ]]; then
-  sudo hab license accept
-else
-  echo "Habitat license already accepted via HAB_LICENSE environment variable"
+# Set up writable HAB_ROOT_PATH on macOS to avoid read-only filesystem issues
+if [[ "$OSTYPE" == darwin* ]]; then
+  export HAB_ROOT_PATH
+  HAB_ROOT_PATH=$(mktemp -d /tmp/hab-root-XXXXXX)
+  # Clean up Darwin-specific temp directory on exit
+  trap 'rm -rf "$HAB_ROOT_PATH"' EXIT
 fi
 
+# Always accept habitat license
+sudo -E hab license accept
+
 get_rustfmt_toolchain() {
   # It turns out that every nightly version of rustfmt has slight tweaks from the previous version.
   # This means that if we're always using the latest version, then we're going to have enormous

.expeditor/verify.pipeline.yml

@@ -7,6 +7,7 @@ expeditor:
     buildkite:
       timeout_in_minutes: 60
       env:
+        HAB_LICENSE: "accept-no-persist"
         HAB_BLDR_CHANNEL: "base-2025"
         HAB_STUDIO_SECRET_HAB_REFRESH_CHANNEL: "base-2025"
         HAB_REFRESH_CHANNEL: "base-2025"
@@ -50,10 +51,19 @@ steps:
 
   - label: "[lint] :linux: :paperclip: clippy!"
     command: make lint
-    expeditor:
-      executor:
-        docker:
-          privileged: true
+    agents:
+      queue: 'default-privileged'
+    plugins:
+      docker#v3.3.0:
+        always-pull: true
+        user: "buildkite-agent"
+        group: "buildkite-agent"
+        image: "chefes/buildkite"
+        privileged: true
+        environment:
+          - HAB_LICENSE
+          - HAB_AUTH_TOKEN
+          - HAB_BLDR_CHANNEL
     timeout_in_minutes: 10
 
   - label: "[lint] :windows: :paperclip: clippy!"
@@ -586,22 +596,67 @@ steps:
       automatic:
         limit: 10 # Addressing current Anka system timeouts due to oversubscription
 
-  - label: "[unit] :darwin: multiple components"
+  - label: "[unit] :darwin: common"
     env:
       HAB_LICENSE: "accept-no-persist"
       HOMEBREW_NO_AUTO_UPDATE: 1
     command:
       - .expeditor/scripts/verify/run_cargo_test.sh common
+    expeditor:
+      executor:
+        macos:
+          os-version: "12"
+          inherit-environment-vars: true
+    timeout_in_minutes: 20
+    retry:
+      automatic:
+        limit: 1
+
+  - label: "[unit] :darwin: core"
+    env:
+      HAB_LICENSE: "accept-no-persist"
+      HOMEBREW_NO_AUTO_UPDATE: 1
+    command:
       - .expeditor/scripts/verify/run_cargo_test.sh core
+    expeditor:
+      executor:
+        macos:
+          os-version: "12"
+          inherit-environment-vars: true
+    timeout_in_minutes: 20
+    soft_fail: true
+    retry:
+      automatic:
+        limit: 1
+
+  - label: "[unit] :darwin: hab"
+    env:
+      HAB_LICENSE: "accept-no-persist"
+      HOMEBREW_NO_AUTO_UPDATE: 1
+    command:
       - .expeditor/scripts/verify/run_cargo_test.sh hab
+    expeditor:
+      executor:
+        macos:
+          os-version: "12"
+          inherit-environment-vars: true
+    timeout_in_minutes: 20
+    retry:
+      automatic:
+        limit: 1
+
+  - label: "[unit] :darwin: http-client"
+    env:
+      HAB_LICENSE: "accept-no-persist"
+      HOMEBREW_NO_AUTO_UPDATE: 1
+    command:
       - .expeditor/scripts/verify/run_cargo_test.sh http-client
     expeditor:
       executor:
         macos:
           os-version: "12"
           inherit-environment-vars: true
-    timeout_in_minutes: 30
-    soft_fail: true
+    timeout_in_minutes: 20
     retry:
       automatic:
         limit: 1