Change 33179
Rename /root/helix_binaries to /root/p4_binaries consistently; fix init_root_dirs_for_local_installs.sh's stale duplicate-download logic.
cli_tests.cfg used /root/helix_binaries as its rsync source in all 14
Sample-Depot/local-install test-setup steps, while bootstrap_test_machine.sh
(new this session) independently creates and populates that same cache
directory for its own initial-clone bootstrap need -- both under the old
pre-SDP-1379 Helix-branded name. Renamed to /root/p4_binaries in both.
init_root_dirs_for_local_installs.sh (older, predates bootstrap_test_machine.sh)
created BOTH /root/helix_binaries and /root/p4_binaries as a redundant
duplicate download; its own comment mislabeled helix_binaries as the
'legacy' name even though it was the only one cli_tests.cfg ever actually
used. Its preflight check also unconditionally bailed if either already
existed, meaning it could no longer run on any machine already bootstrapped
via bootstrap_test_machine.sh. Simplified to a single /root/p4_binaries
(skipping the download if bootstrap_test_machine.sh already populated it)
and /root/downloads (the Sample Depot tarball cache, which nothing else
populates).
Verified on the r9x86_64 canary: LocalInstallWithSD (Sample Depot group)
15/15, and a full suite run of 287/287 with zero failures.
Agent: Claude Code (Sonnet 5, claude-sonnet-5)
cli_tests.cfg used /root/helix_binaries as its rsync source in all 14
Sample-Depot/local-install test-setup steps, while bootstrap_test_machine.sh
(new this session) independently creates and populates that same cache
directory for its own initial-clone bootstrap need -- both under the old
pre-SDP-1379 Helix-branded name. Renamed to /root/p4_binaries in both.
init_root_dirs_for_local_installs.sh (older, predates bootstrap_test_machine.sh)
created BOTH /root/helix_binaries and /root/p4_binaries as a redundant
duplicate download; its own comment mislabeled helix_binaries as the
'legacy' name even though it was the only one cli_tests.cfg ever actually
used. Its preflight check also unconditionally bailed if either already
existed, meaning it could no longer run on any machine already bootstrapped
via bootstrap_test_machine.sh. Simplified to a single /root/p4_binaries
(skipping the download if bootstrap_test_machine.sh already populated it)
and /root/downloads (the Sample Depot tarball cache, which nothing else
populates).
Verified on the r9x86_64 canary: LocalInstallWithSD (Sample Depot group)
15/15, and a full suite run of 287/287 with zero failures.
Agent: Claude Code (Sonnet 5, claude-sonnet-5)