[vs] Add missing installation to SWSS build (sonic-net#211)

- Include python3 swsscommon in SWSS VS build
- Unify swss and sairedis dockerfiles

Signed-off-by: Danny Allen <[email protected]>

Author: daall

scripts/vs/sonic-sairedis-build/build.sh

@@ -12,7 +12,7 @@ cp common/*swsscommon*_1.0.0_amd64.deb scripts/vs/sonic-sairedis-build/docker-so
 
 docker load < buildimage/target/docker-sonic-vs.gz
 
-pushd scripts/vs/sonic-sairedis-build
+pushd scripts/vs/sonic-swss-build
 docker build --no-cache -t docker-sonic-vs:${JOB_NAME##*/}.${BUILD_NUMBER} docker-sonic-vs
 popd
 

scripts/vs/sonic-sairedis-build/docker-sonic-vs/Dockerfile

@@ -6,12 +6,11 @@ ADD ["debs", "/debs"]
 
 RUN dpkg -i /debs/libswsscommon_1.0.0_amd64.deb
 RUN dpkg -i /debs/python-swsscommon_1.0.0_amd64.deb
+RUN dpkg -i /debs/python3-swsscommon_1.0.0_amd64.deb
 
 RUN dpkg -i /debs/libsaimetadata_1.0.0_amd64.deb
 RUN dpkg -i /debs/libsairedis_1.0.0_amd64.deb
 RUN dpkg -i /debs/libsaivs_1.0.0_amd64.deb
 RUN dpkg -i /debs/syncd-vs_1.0.0_amd64.deb
 
-RUN md5sum /usr/bin/orchagent
 RUN dpkg -i /debs/swss_1.0.0_amd64.deb
-RUN md5sum /usr/bin/orchagent