According to the sdp_upgrade.sh documentation customizations in /p4/common/config/p4_1.vars that are below "### MAKE LOCAL CHANGES HERE'" should be preserved. During my testing of upgrading an ESP deployment I am not seeing this.

The sdp_upgrade.sh documentation I am referring to:

    For Steps 3 and 4, the re-generation logic will preserve current
    settings. If upgrading from SDP r20.1, any custom logic that
    exist below the '### MAKE LOCAL CHANGES HERE' tag will be
    split it separate files.  Custom logic in p4_vars will be moved
    to /p4/common/site/config/p4_vars.local. Custom logic in
    p4_N.vars files will be moved to /p4/common/site/config/p4_N.vars.local.

My steps:

1) ESP deployment on AWS
2) Opt into AWS SNS notifications. This steps writes two environment variables into /p4/common/config/p4_1.vars
3) Follow the Sample SDP Upgrade Procedure https://swarm.workshop.perforce.com/projects/perforce-software-sdp/view/main/doc/SDP_Guide.Unix.html#_sample_sdp_upgrade_procedure
4) Post upgrade check the shell environment, /p4/common/config/p4_1.vars, and /p4/common/site/config/p4_1.vars.local
5) Customizations will not found

Expected Behavior

Environment variables that are added to the very bottom of /p4/common/config/p4_1.vars should have been migrated to /p4/common/site/config/p4_1.vars.local.

log files

screenshots

This needs a patch ASAP. Stay tuned.