Change 33407
Merge Down from //p4-sdp/dev into //p4-sdp/dev_rebrand, ahead of
Copy Up (dev_rebrand -> dev -> main) for the first Streams-native release.
8 files needed real resolve attention (out of the full pending set --
everything else was a clean auto-merge). Reviewed each individually
rather than blanket-accepting one side, per the Merge Down/Copy Up
philosophy (Copy Up later will be a forced blast-replace; this step is
where we're selective and must not lose anything real):
- Server/test/test_SDP.py: accept yours (dev_rebrand). Every difference
was pre-rebrand naming (hxdepots/helix_binaries/etc.) that dev's copy
predates; dev_rebrand's rebranded content is a strict superset.
- Server/test/test_Upgrade.py: manual merge, not a single-side accept.
Kept dev_rebrand's rebranded naming, its '-Ov' flag (still needed --
dev_rebrand's own Version file is a stale placeholder that trips
upgrade.sh's real version-mismatch safety check unless overridden, see
change 33294), and its testUpgradeSBDLowSecurityAborts method (this
session's SDP-1350 test, absent from dev entirely -- would have been
silently deleted by a naive accept-theirs). Adopted dev's two
timeout=60->120 bumps in testUpgrade (change 33269, a real flakiness
fix), which dev_rebrand had never picked up.
- test/docker/Dockerfile.rocky8 (new)/.base/.sdp (deleted): accept
theirs. dev_rebrand's old split .base/.sdp files were untouched since a
2025-07-14 stream-conversion branch operation -- no rebranding content,
nothing at risk. Robert Cowham's newer consolidated, uv-based
Dockerfile.rocky8 in dev is a clean improvement, matching the same
pattern already established for Dockerfile.rocky9.
- test/docker/Dockerfile.rocky9: accept theirs. Only difference was one
harmless, already-commented-out line.
- test/docker/files/test_sdp.sh: accept yours (dev_rebrand), content and
filetype. Every difference was rebranding (paths, and the exact
swarm.workshop.perforce.com -> workshop.perforce.com URL fix from this
session's own SDP-1379 sweep) plus a partial Version ID Block dev
entirely lacks.
- test/run_docker_tests.sh: accept theirs (dev), content and filetype.
dev has a complete, working Version ID Block (matching the SDP-1161
standard this session established, which this particular test-infra
file had been missed by) plus a real functional improvement -- using
$VersionStream to make podman container/image names unique per-stream,
avoiding Jenkins collisions between concurrent stream builds
(Robert Cowham, change 33303). Confirmed nothing unique to dev_rebrand's
version was lost.
Everything else integrated cleanly with no manual intervention needed.
Copy Up (dev_rebrand -> dev -> main) for the first Streams-native release.
8 files needed real resolve attention (out of the full pending set --
everything else was a clean auto-merge). Reviewed each individually
rather than blanket-accepting one side, per the Merge Down/Copy Up
philosophy (Copy Up later will be a forced blast-replace; this step is
where we're selective and must not lose anything real):
- Server/test/test_SDP.py: accept yours (dev_rebrand). Every difference
was pre-rebrand naming (hxdepots/helix_binaries/etc.) that dev's copy
predates; dev_rebrand's rebranded content is a strict superset.
- Server/test/test_Upgrade.py: manual merge, not a single-side accept.
Kept dev_rebrand's rebranded naming, its '-Ov' flag (still needed --
dev_rebrand's own Version file is a stale placeholder that trips
upgrade.sh's real version-mismatch safety check unless overridden, see
change 33294), and its testUpgradeSBDLowSecurityAborts method (this
session's SDP-1350 test, absent from dev entirely -- would have been
silently deleted by a naive accept-theirs). Adopted dev's two
timeout=60->120 bumps in testUpgrade (change 33269, a real flakiness
fix), which dev_rebrand had never picked up.
- test/docker/Dockerfile.rocky8 (new)/.base/.sdp (deleted): accept
theirs. dev_rebrand's old split .base/.sdp files were untouched since a
2025-07-14 stream-conversion branch operation -- no rebranding content,
nothing at risk. Robert Cowham's newer consolidated, uv-based
Dockerfile.rocky8 in dev is a clean improvement, matching the same
pattern already established for Dockerfile.rocky9.
- test/docker/Dockerfile.rocky9: accept theirs. Only difference was one
harmless, already-commented-out line.
- test/docker/files/test_sdp.sh: accept yours (dev_rebrand), content and
filetype. Every difference was rebranding (paths, and the exact
swarm.workshop.perforce.com -> workshop.perforce.com URL fix from this
session's own SDP-1379 sweep) plus a partial Version ID Block dev
entirely lacks.
- test/run_docker_tests.sh: accept theirs (dev), content and filetype.
dev has a complete, working Version ID Block (matching the SDP-1161
standard this session established, which this particular test-infra
file had been missed by) plus a real functional improvement -- using
$VersionStream to make podman container/image names unique per-stream,
avoiding Jenkins collisions between concurrent stream builds
(Robert Cowham, change 33303). Confirmed nothing unique to dev_rebrand's
version was lost.
Everything else integrated cleanly with no manual intervention needed.
Tip: Use n and p to cycle through the changes.