@mohammad_shamim
There is no other workaround for "HS2 role count in Hive and Hive on Tez services should match" other than making the role counts match. You need to add as many HS2 instances in HiveOnTez services as there are in Hive service prior the upgrade. The upgrade process requires this so that configuration from cdh HS2 instances can be mapped to cdp HS2 instances in a 1-to-1 fashion.
Can you please try adding Roles?
If you found this response assisted with your query, please take a moment to log in and click on KUDOS 🙂 & ”Accept as Solution" below this post.