From aac5c04d91c8f3be2bfa0c811bc3e66063903440 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Wed, 12 May 2021 15:19:54 +0800
Subject: [PATCH] [ci/build]: Upgrade SONiC package versions (#7583)

---
 .../docker-config-engine-stretch/versions-py2 |  1 -
 .../docker-gbsyncd-vs/versions-deb-buster     |  1 -
 .../docker-sonic-mgmt-framework/versions-py3  |  3 +
 .../docker-sonic-vs/versions-deb-buster       |  1 -
 .../dockers/docker-sonic-vs/versions-py3      |  5 --
 .../docker-syncd-bfn/versions-deb-buster      | 12 ----
 .../versions-deb-buster                       | 60 -------------------
 .../docker-syncd-centec-rpc/versions-py2      |  5 --
 .../docker-syncd-centec/versions-deb-buster   | 14 +----
 .../docker-syncd-mlnx-rpc/versions-deb-buster | 60 -------------------
 .../docker-syncd-mlnx-rpc/versions-py2        |  5 --
 .../docker-syncd-mlnx/versions-deb-buster     |  9 ---
 .../docker-syncd-vs/versions-deb-buster       |  1 -
 files/build/versions/host-image/versions-py3  |  4 +-
 14 files changed, 6 insertions(+), 175 deletions(-)
 delete mode 100644 files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
 delete mode 100644 files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
 delete mode 100644 files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2

diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2 b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
index c2bea3fa5a..6052286799 100644
--- a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
+++ b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2
@@ -1,4 +1,3 @@
-six==1.15.0
 sonic-config-engine==1.0
 sonic-py-common==1.0
 swsssdk==2.0.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
index abd21dae6b..35fa7ba37f 100644
--- a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
@@ -1,4 +1,3 @@
-iproute2==4.20.0-2
 libsaivs==1.0.0
 libsaivs-dbg==1.0.0
 syncd-vs==1.0.0
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
index 9ecf272e67..35e67ea2d8 100644
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,2 +1,5 @@
+click==8.0.0
+itsdangerous==2.0.0
 six==1.11.0
+Werkzeug==2.0.0
 zipp==3.4.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
index 0b568f2710..2f3ae7e033 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -30,7 +30,6 @@ libyang-cpp==1.0.73
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
 pinentry-curses==1.1.0-2
-psmisc==23.2-1
 python-ply==3.11-3
 python2-yang==1.0.73
 python3-yang==1.0.73
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
index 7e59fc6ebb..920a529e3b 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-py3
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -1,16 +1,11 @@
 certifi==2020.12.5
-chardet==3.0.4
 Click==7.0
-deepdiff==5.2.3
 ijson==2.6.1
 jsondiff==1.3.0
 M2Crypto==0.37.1
-netifaces==0.10.9
-ordered-set==4.0.2
 parameterized==0.8.1
 pexpect==4.8.0
 ptyprocess==0.7.0
-requests==2.25.0
 tabulate==0.8.9
 urllib3==1.26.4
 xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
deleted file mode 100644
index ee5c2bee16..0000000000
--- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster
+++ /dev/null
@@ -1,12 +0,0 @@
-bfnplatform==1.0.0
-bfnsdk==1.0.0
-libcurl3-gnutls==7.64.0-4+deb10u2
-libcurl4-gnutls-dev==7.64.0-4+deb10u2
-libgoogle-perftools4==2.7-1
-liblzma-dev==5.2.4-1
-libpcap-dev==1.8.1-6
-libpcap0.8-dev==1.8.1-6
-libtcmalloc-minimal4==2.7-1
-libunwind-dev==1.2.1-10~deb10u1
-libusb-1.0-0==2:1.0.22-2
-libusb-1.0-0-dev==2:1.0.22-2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
deleted file mode 100644
index 6d93dfe784..0000000000
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
+++ /dev/null
@@ -1,60 +0,0 @@
-binutils==2.31.1-16
-binutils-common==2.31.1-16
-binutils-x86-64-linux-gnu==2.31.1-16
-build-essential==12.6
-cmake==3.13.4-1
-cmake-data==3.13.4-1
-cpp==4:8.3.0-1
-cpp-8==8.3.0-6
-g++==4:8.3.0-1
-g++-8==8.3.0-6
-gcc==4:8.3.0-1
-gcc-8==8.3.0-6
-libarchive13==3.3.3-4+deb10u1
-libasan5==8.3.0-6
-libbinutils==2.31.1-16
-libboost-atomic1.67.0==1.67.0-13+deb10u1
-libboost-atomic1.71.0==1.71.0-6~bpo10+1
-libcc1-0==8.3.0-6
-libdouble-conversion1==3.1.0-3
-libdpkg-perl==1.19.7
-libexpat1-dev==2.2.6-2+deb10u1
-libffi-dev==3.2.1-9
-libgcc-8-dev==8.3.0-6
-libgomp1==8.3.0-6
-libisl19==0.20-2
-libitm1==8.3.0-6
-libjsoncpp1==1.7.4-3
-liblsan0==8.3.0-6
-libmpc3==1.1.0-1
-libmpfr6==4.0.2-1
-libmpx2==8.3.0-6
-libpcre2-16-0==10.32-5
-libpcre2-8-0==10.32-5
-libpython-dev==2.7.16-1
-libpython2-dev==2.7.16-1
-libpython2.7-dev==2.7.16-2+deb10u1
-libqt5core5a==5.11.3+dfsg1-1+deb10u4
-libqt5dbus5==5.11.3+dfsg1-1+deb10u4
-libqt5network5==5.11.3+dfsg1-1+deb10u4
-libquadmath0==8.3.0-6
-librhash0==1.3.8-1
-libssl-dev==1.1.1d-0+deb10u6
-libstdc++-8-dev==8.3.0-6
-libthrift-0.11.0==0.11.0-4
-libtsan0==8.3.0-6
-libubsan1==8.3.0-6
-libuv1==1.24.1-1
-make==4.2.1-1.2
-patch==2.7.6-3+deb10u1
-python-dev==2.7.16-1
-python-pip==18.1-5
-python-pip-whl==18.1-5
-python-pkg-resources==40.8.0-1
-python-ptf==0.9-1
-python-scapy==2.4.0-2
-python-setuptools==40.8.0-1
-python2-dev==2.7.16-1
-python2.7-dev==2.7.16-2+deb10u1
-syncd-rpc==1.0.0
-wget==1.20.1-1.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2 b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
deleted file mode 100644
index f2d6dd3c85..0000000000
--- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
+++ /dev/null
@@ -1,5 +0,0 @@
-cffi==1.7.0
-nnpy==1.4.2
-ptf==0.9.1
-pycparser==2.20
-scapy==2.4.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
index 74abbdb5bd..e5836f0be3 100644
--- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
@@ -1,13 +1 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libsai==1.6.3-1
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+libsai==1.6.3-1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
deleted file mode 100644
index 6d93dfe784..0000000000
--- a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-buster
+++ /dev/null
@@ -1,60 +0,0 @@
-binutils==2.31.1-16
-binutils-common==2.31.1-16
-binutils-x86-64-linux-gnu==2.31.1-16
-build-essential==12.6
-cmake==3.13.4-1
-cmake-data==3.13.4-1
-cpp==4:8.3.0-1
-cpp-8==8.3.0-6
-g++==4:8.3.0-1
-g++-8==8.3.0-6
-gcc==4:8.3.0-1
-gcc-8==8.3.0-6
-libarchive13==3.3.3-4+deb10u1
-libasan5==8.3.0-6
-libbinutils==2.31.1-16
-libboost-atomic1.67.0==1.67.0-13+deb10u1
-libboost-atomic1.71.0==1.71.0-6~bpo10+1
-libcc1-0==8.3.0-6
-libdouble-conversion1==3.1.0-3
-libdpkg-perl==1.19.7
-libexpat1-dev==2.2.6-2+deb10u1
-libffi-dev==3.2.1-9
-libgcc-8-dev==8.3.0-6
-libgomp1==8.3.0-6
-libisl19==0.20-2
-libitm1==8.3.0-6
-libjsoncpp1==1.7.4-3
-liblsan0==8.3.0-6
-libmpc3==1.1.0-1
-libmpfr6==4.0.2-1
-libmpx2==8.3.0-6
-libpcre2-16-0==10.32-5
-libpcre2-8-0==10.32-5
-libpython-dev==2.7.16-1
-libpython2-dev==2.7.16-1
-libpython2.7-dev==2.7.16-2+deb10u1
-libqt5core5a==5.11.3+dfsg1-1+deb10u4
-libqt5dbus5==5.11.3+dfsg1-1+deb10u4
-libqt5network5==5.11.3+dfsg1-1+deb10u4
-libquadmath0==8.3.0-6
-librhash0==1.3.8-1
-libssl-dev==1.1.1d-0+deb10u6
-libstdc++-8-dev==8.3.0-6
-libthrift-0.11.0==0.11.0-4
-libtsan0==8.3.0-6
-libubsan1==8.3.0-6
-libuv1==1.24.1-1
-make==4.2.1-1.2
-patch==2.7.6-3+deb10u1
-python-dev==2.7.16-1
-python-pip==18.1-5
-python-pip-whl==18.1-5
-python-pkg-resources==40.8.0-1
-python-ptf==0.9-1
-python-scapy==2.4.0-2
-python-setuptools==40.8.0-1
-python2-dev==2.7.16-1
-python2.7-dev==2.7.16-2+deb10u1
-syncd-rpc==1.0.0
-wget==1.20.1-1.1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2 b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2
deleted file mode 100644
index f2d6dd3c85..0000000000
--- a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2
+++ /dev/null
@@ -1,5 +0,0 @@
-cffi==1.7.0
-nnpy==1.4.2
-ptf==0.9.1
-pycparser==2.20
-scapy==2.4.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index a562e132a7..d7f3b10e7d 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -3,17 +3,8 @@ applibs-dev==1.mlnx.4.4.2522
 iproute2==1.mlnx.4.4.2522
 iproute2-dev==1.mlnx.4.4.2522
 libelf1==0.176-1.1
-libexpat1-dev==2.2.6-2+deb10u1
-libpython-dev==2.7.16-1
-libpython2-dev==2.7.16-1
-libpython2.7-dev==2.7.16-2+deb10u1
 mlnx-sai==1.mlnx.SAIRel1.18.3.0
-python-dev==2.7.16-1
-python-pkg-resources==40.8.0-1
 python-sdk-api==1.mlnx.4.4.2522
-python-setuptools==40.8.0-1
-python2-dev==2.7.16-1
-python2.7-dev==2.7.16-2+deb10u1
 sx-acl-helper==1.mlnx.4.4.2522
 sx-acl-helper-dev==1.mlnx.4.4.2522
 sx-complib==1.mlnx.4.4.2522
diff --git a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
index abd21dae6b..35fa7ba37f 100644
--- a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
@@ -1,4 +1,3 @@
-iproute2==4.20.0-2
 libsaivs==1.0.0
 libsaivs-dbg==1.0.0
 syncd-vs==1.0.0
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 3465732c39..92bd5b54d7 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -11,12 +11,12 @@ docker==4.3.1
 idna==2.10
 ijson==2.6.1
 ipaddress==1.0.23
-Jinja2==2.11.3
+Jinja2==3.0.0
 jsondiff==1.3.0
 jsonschema==2.6.0
 lxml==4.6.3
 M2Crypto==0.37.1
-MarkupSafe==1.1.1
+MarkupSafe==2.0.0
 natsort==6.2.1
 netaddr==0.8.0
 netifaces==0.10.9