Removed python2 dependency for sonic-pcied in sonic-platform-daemons (#…

…10421)

Removed python2 support for sonic-platform-daemons that was causing unit
test errors in sonic_pcied.
* Removed config from docker supervisord jinja templates per VD review comment
* Removed space and python3 per QL comments

dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2

@@ -171,7 +171,7 @@ dependent_startup_wait_for=rsyslogd:running
 
 {% if not skip_pcied %}
 [program:pcied]
-command={% if API_VERSION == 3 and 'pcied' not in python2_daemons %}python3 {% else %} python2 {% endif %}/usr/local/bin/pcied
+command=/usr/local/bin/pcied
 priority=11
 autostart=false
 autorestart=unexpected

rules/sonic-pcied.dep

@@ -3,12 +3,6 @@ DEP_FILES:= $(SONIC_COMMON_FILES_LIST) rules/sonic-pcied.mk rules/sonic-pcied.de
 DEP_FILES+= $(SONIC_COMMON_BASE_FILES_LIST)
 SMDEP_FILES:= $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files))
 
-$(SONIC_PCIED_PY2)_CACHE_MODE:= GIT_CONTENT_SHA
-$(SONIC_PCIED_PY2)_DEP_FLAGS:= $(SONIC_COMMON_FLAGS_LIST)
-$(SONIC_PCIED_PY2)_DEP_FILES:= $(DEP_FILES)
-$(SONIC_PCIED_PY2)_SMDEP_FILES:= $(SMDEP_FILES)
-$(SONIC_PCIED_PY2)_SMDEP_PATHS:= $(SPATH)
-
 $(SONIC_PCIED_PY3)_CACHE_MODE:= GIT_CONTENT_SHA
 $(SONIC_PCIED_PY3)_DEP_FLAGS:= $(SONIC_COMMON_FLAGS_LIST)
 $(SONIC_PCIED_PY3)_DEP_FILES:= $(DEP_FILES)

rules/sonic-pcied.mk

@@ -1,17 +1,9 @@
 # sonic-pcied (SONiC PCIe Monitor daemon) Debian package
 
-# SONIC_PCIED_PY2 package
-
-SONIC_PCIED_PY2 = sonic_pcied-1.0-py2-none-any.whl
-$(SONIC_PCIED_PY2)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-pcied
-$(SONIC_PCIED_PY2)_DEPENDS = $(SONIC_PY_COMMON_PY2)
-$(SONIC_PCIED_PY2)_PYTHON_VERSION = 2
-SONIC_PYTHON_WHEELS += $(SONIC_PCIED_PY2)
-
 # SONIC_PCIED_PY3 package
 
 SONIC_PCIED_PY3 = sonic_pcied-1.0-py3-none-any.whl
 $(SONIC_PCIED_PY3)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-pcied
-$(SONIC_PCIED_PY3)_DEPENDS = $(SONIC_PY_COMMON_PY3) $(SONIC_PCIED_PY2)
+$(SONIC_PCIED_PY3)_DEPENDS = $(SONIC_PY_COMMON_PY3)
 $(SONIC_PCIED_PY3)_PYTHON_VERSION = 3
 SONIC_PYTHON_WHEELS += $(SONIC_PCIED_PY3)