Skip empty input golden config check for upstream-t2 linecard

Skip override_config_table_masic for upstream LC

Remove redundant changes

tests/override_config_table/test_override_config_table_masic.py

@@ -220,18 +220,23 @@ def load_minigraph_with_golden_empty_table_removal(duthost):
     )
 
 
-def test_load_minigraph_with_golden_config(duthosts, setup_env,
+def test_load_minigraph_with_golden_config(duthosts, setup_env, tbinfo, enum_upstream_dut_hostname,
                                            enum_rand_one_per_hwsku_frontend_hostname):
     """
     Test Golden Config override during load minigraph
     Note: Skip full config override for multi-asic duts for now, because we
     don't have CLI to get new golden config that contains 'localhost' and 'asicxx'
     """
     duthost = duthosts[enum_rand_one_per_hwsku_frontend_hostname]
+    duthost_up = duthosts[enum_upstream_dut_hostname]
     if not duthost.is_multi_asic:
         pytest.skip("Skip override-config-table multi-asic testing on single-asic platforms,\
                     test provided golden config format is not compatible with single-asics")
-    load_minigraph_with_golden_empty_input(duthost)
+    topo_type = tbinfo["topo"]["type"]
+    if topo_type == 't2' and duthost != duthost_up:
+        # Skip empty golden-config testing on upstream linecards,
+        # since the handling of empty golden config doesn't work on upstream linecards
+        load_minigraph_with_golden_empty_input(duthost)
     load_minigraph_with_golden_partial_config(duthost)
     load_minigraph_with_golden_new_feature(duthost)
     load_minigraph_with_golden_empty_table_removal(duthost)