So Server upgraded and Portal installed fine. Then when I tried to upgrade Data Store I ran into issues. I ended up deleting the Data Store and re-installing. This is the error I'm getting now:
Error registering data source '{"path":"/enterpriseDatabases/AGSDataStore_ds_g9qk4les","type":"egdb","clientPath":"","make":"ArcGIS Data Store","provider":"ArcGIS Data Store","info":{"isManaged":true,"provider":"ArcGIS Data Store","dataStoreConnectionType":"serverOnly","connectionString":"PASSWORD=yAu=vG47E1I=;SERVER=GISSERVER.ES2.LOCAL;INSTANCE=sde:postgresql:GISSERVER.ES2.LOCAL,9876;DBCLIENT=postgresql;DB_CONNECTION_PROPERTIES=GISSERVER.ES2.LOCAL,9876;DATABASE=db_vixze;USER=hsu_riidy;VERSION=sde.DEFAULT;AUTHENTICATION_MODE=DBMS","connectionStringHA":"PASSWORD=yAu=vG47E1I=;SERVER=ds_g9qk4les;INSTANCE=sde:postgresql:DSID=ds_g9qk4les;DBCLIENT=postgresql;DATABASE=db_vixze;USER=hsu_riidy;VERSION=sde.DEFAULT;AUTHENTICATION_MODE=DBMS","JDBCConnection":{"name":"PostgreSQLonGISSERVER.ES2.LOCAL","factory":"org.apache.tomcat.jdbc.pool.DataSourceFactory","driverClassName":"org.postgresql.Driver","url":"jdbc:postgresql://GISSERVER.ES2.LOCAL:9876/db_vixze","username":"hsu_riidy","password":"yAu=vG47E1I=","initialSize":0,"minIdle":0,"timeBetweenEvictionRunsMillis":10000,"minEvictableIdleTimeMillis":20000,"testOnBorrow":true,"validationQuery":"SELECT 1"},"machines":[{"name":"GISSERVER.ES2.LOCAL","adminURL":"https://GISSERVER.ES2.LOCAL:2443/arcgis/datastoreadmin/","dbPort":9876,"platform":"Windows","role":"PRIMARY"}]}}'. Registration of database '/enterpriseDatabases/AGSDataStore_ds_g9qk4les' is incomplete. Failed to get connection string from System/PublishingTools GP service.
