Change 33366

bot_Claude_Anthropic (Claude (AI Agent by Anthropic))
Claude (AI Agent by Anthropic) committed this change into //p4-sdp/dev_rebrand
Request Review
Download .zip
SDP-1286: Make auth.id and the default commit-server ServerID OrgName-aware.

Introduces an optional ORGNAME setting (blank by default, preserving
prior-release values) so that:
- The default commit-server ServerID (MASTER_ID in mkdirs.cfg) becomes
  master.<OrgName>.<SDPInstance> when OrgName is set, per the Server Spec
  Naming Standard.
- configure_new_server.sh's auth.id default becomes
  p4_<OrgName>.<SDPInstance>, independent of $P4SERVER (which remains a
  fixed p4_<SDPInstance> shorthand used elsewhere for filenames/log tags).
- ccheck.sh's auth.id auto-fix advice is corrected to match this pattern
  (it previously suggested p4_<P4MASTER_ID>, which used the wrong basis
  entirely).

A more unique auth.id also avoids collisions during cross-organization
p4 push/p4 fetch, which require differing auth.id values on either side.

install_sdp.sh gains a Config['OrgName'] setting, wired into generated
mkdirs.<N>.cfg files. Doc updated in SDP_Guide.Unix.adoc to reflect that
this is now the actual implemented default, not just documented guidance.

No mkrep.sh changes needed (it only inherits P4MASTER_ID).
  • Files 7
  • Comments 0
7 edited 0 added 0 deleted
Server/Unix/p4/common/bin/ccheck.sh#4
Loading...
Server/Unix/p4/common/config/p4_vars.template#8
Loading...
Server/Unix/setup/install_sdp.sh#23
Loading...
Server/Unix/setup/mkdirs.cfg#4
Loading...
Server/Unix/setup/mkdirs.sh#10
Loading...
Server/setup/configure_new_server.sh#16
Loading...
doc/SDP_Guide.Unix.adoc#14
Loading...
Tip: Use n and p to cycle through the changes.