From 550ab26fc7f426e75974ca40285600eeb586e8e3 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Tue, 12 Jul 2022 23:39:32 +0800 Subject: [PATCH] [ci/build]: Upgrade SONiC package versions (#11422) --- .../versions/build/build-sonic-slave-buster/versions-git | 2 +- files/build/versions/default/versions-git | 4 ++-- files/build/versions/default/versions-web | 4 ++-- .../dockers/docker-config-engine-buster/versions-py3 | 2 +- .../dockers/docker-sonic-mgmt-framework/versions-py3 | 2 +- .../docker-sonic-mgmt-framework/versions-py3-all-arm64 | 1 + .../docker-sonic-mgmt-framework/versions-py3-all-armhf | 1 + files/build/versions/dockers/docker-sonic-vs/versions-py2 | 2 +- files/build/versions/dockers/docker-sonic-vs/versions-py3 | 2 +- .../dockers/sonic-slave-buster/versions-deb-buster-arm64 | 2 +- .../dockers/sonic-slave-buster/versions-deb-buster-armhf | 2 +- .../build/versions/dockers/sonic-slave-buster/versions-git | 2 +- .../build/versions/dockers/sonic-slave-buster/versions-py3 | 2 +- .../build/versions/dockers/sonic-slave-stretch/versions-git | 2 +- files/build/versions/host-image/versions-deb-buster | 1 + files/build/versions/host-image/versions-deb-buster-arm64 | 1 + files/build/versions/host-image/versions-deb-buster-armhf | 1 + files/build/versions/host-image/versions-py3 | 6 +++--- 18 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64 create mode 100644 files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git index f397c1b7ef7f..67d6f424e2b2 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-git +++ b/files/build/versions/build/build-sonic-slave-buster/versions-git @@ -5,7 +5,7 @@ https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 https://github.com/sflow/host-sflow==4ff2a940848fa9244a289f9c96fd9681d31a0264 https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f -https://github.com/thom311/libnl==44988e648cd5c9f912148e8b138776064797f49d +https://github.com/thom311/libnl==3399f520bae2231c5b6a6c2adce52b383292c520 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5 https://salsa.debian.org/dhcp-team/isc-dhcp.git==18ecb042065e51e088b7470566526cd00e297c14 https://salsa.debian.org/kernel-team/ethtool/==5ead2b58847600ea0ccd0aa76b5bedce678f17ee diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 105794e437e5..dfc065b4da52 100644 --- a/files/build/versions/default/versions-git +++ b/files/build/versions/default/versions-git @@ -1,4 +1,4 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==78c53d11a01f8439b37010289e8bbdb139942d57 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==d22bf607218d50bf20444b0610f62b265f829dbc https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==87375f15159545a87a1e0de200f5d9d67e9091d7 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b @@ -11,7 +11,7 @@ https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479 https://github.com/sflow/host-sflow==4ff2a940848fa9244a289f9c96fd9681d31a0264 https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f -https://github.com/thom311/libnl==44988e648cd5c9f912148e8b138776064797f49d +https://github.com/thom311/libnl==3399f520bae2231c5b6a6c2adce52b383292c520 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5 https://salsa.debian.org/dhcp-team/isc-dhcp.git==18ecb042065e51e088b7470566526cd00e297c14 https://salsa.debian.org/kernel-team/ethtool/==5ead2b58847600ea0ccd0aa76b5bedce678f17ee diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web index e00c279b127a..6adf222a46ae 100644 --- a/files/build/versions/default/versions-web +++ b/files/build/versions/default/versions-web @@ -19,9 +19,9 @@ https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3 https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:2fe24264d5b4585ecd16ba8e9bb582d8f4b20875==e1557fb4a093dec95a2251d01f0d4cd3 https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a -https://deb.nodesource.com/node_14.x/dists/buster/Release==6b181b4ad151ab26c7c7738ec8534ed3 +https://deb.nodesource.com/node_14.x/dists/buster/Release==2c6b9d29a3e20816e0ed35475d52e0d3 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1 -https://deb.nodesource.com/setup_14.x==3fb63a2bd38414a2b249fa9b3dbbbc3e +https://deb.nodesource.com/setup_14.x==badb28cf0604d9ff24c5fc3396b594d4 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20220221_sai.1.7.1_deb10.deb==65de37f7834823ba69ab5e55acc5c5f4 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20220221_sai.1.7.1_deb10.deb==75df8156b85467b501dc67f1914d6ed7 diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3 index 0c60fea19868..765d73fa6aaf 100644 --- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 +++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3 @@ -8,5 +8,5 @@ pyangbind==0.8.1 pyyaml==5.4.1 redis==3.5.3 redis-dump-load==1.1 -regex==2022.6.2 +regex==2022.7.9 six==1.16.0 \ No newline at end of file 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 c07300965a59..8fe65d491263 100644 --- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 @@ -12,7 +12,7 @@ importlib-metadata==4.12.0 importlib-resources==5.8.0 inflection==0.5.1 itsdangerous==2.1.2 -jsonschema==4.6.1 +jsonschema==4.7.2 openapi-schema-validator==0.2.3 openapi-spec-validator==0.4.0 protobuf==4.21.2 diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64 new file mode 100644 index 000000000000..b14bd866f5b8 --- /dev/null +++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-arm64 @@ -0,0 +1 @@ +jsonschema==4.7.1 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf new file mode 100644 index 000000000000..b14bd866f5b8 --- /dev/null +++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3-all-armhf @@ -0,0 +1 @@ +jsonschema==4.7.1 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2 index d6a13c7bdda0..1db34fe35214 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-py2 +++ b/files/build/versions/dockers/docker-sonic-vs/versions-py2 @@ -10,4 +10,4 @@ pyroute2==0.5.3 requests==2.27.1 scapy==2.4.0 six==1.16.0 -urllib3==1.26.9 \ No newline at end of file +urllib3==1.26.10 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3 index 6e78a4a6e068..1519f87a3801 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3 @@ -12,5 +12,5 @@ pyroute2==0.5.14 requests==2.28.1 scapy==2.4.4 tabulate==0.8.10 -urllib3==1.26.9 +urllib3==1.26.10 xmltodict==0.12.0 \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 index c04653adb0f4..ae8f49c2dc58 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 @@ -4,4 +4,4 @@ libdrm-freedreno1==2.4.97-1 libdrm-tegra0==2.4.97-1 libtext-iconv-perl==1.7-5+b6 libxslt1-dev==1.1.32-2.2~deb10u1 -nodejs==14.19.3-deb-1nodesource1 \ No newline at end of file +nodejs==14.20.0-deb-1nodesource1 \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf index 648627cb4e1a..a994f5f0fe27 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf @@ -103,7 +103,7 @@ linux-compiler-gcc-8-arm==4.19.249-2 llvm-6.0==1:6.0.1-10 llvm-6.0-dev==1:6.0.1-10 llvm-6.0-runtime==1:6.0.1-10 -nodejs==14.19.3-deb-1nodesource1 +nodejs==14.20.0-deb-1nodesource1 ps2eps==1.68+binaryfree-2 rdfind==1.4.1-1 sassc==3.5.0-1 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git index c37b4e348e98..d7cbfb3e3c61 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-git +++ b/files/build/versions/dockers/sonic-slave-buster/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==78c53d11a01f8439b37010289e8bbdb139942d57 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==d22bf607218d50bf20444b0610f62b265f829dbc https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3 index bfa13ac00047..3ff9fa9ec159 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-py3 +++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3 @@ -58,7 +58,7 @@ pytz==2019.1 pyxdg==0.25 pyyaml==5.4.1 redis==3.5.3 -regex==2022.6.2 +regex==2022.7.9 requests==2.21.0 roman==2.0.0 secretstorage==2.3.1 diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git index c37b4e348e98..d7cbfb3e3c61 100644 --- a/files/build/versions/dockers/sonic-slave-stretch/versions-git +++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==78c53d11a01f8439b37010289e8bbdb139942d57 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==d22bf607218d50bf20444b0610f62b265f829dbc https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster index d2eb89dabfe6..4300bcc6e050 100644 --- a/files/build/versions/host-image/versions-deb-buster +++ b/files/build/versions/host-image/versions-deb-buster @@ -50,6 +50,7 @@ gir1.2-packagekitglib-1.0==1.1.12-5 gnupg==2.2.12-1+deb10u2 gnupg-l10n==2.2.12-1+deb10u2 gnupg-utils==2.2.12-1+deb10u2 +gnupg2==2.2.12-1+deb10u2 gpg==2.2.12-1+deb10u2 gpg-agent==2.2.12-1+deb10u2 gpg-wks-client==2.2.12-1+deb10u2 diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64 index 21f7a975c0e2..8f0adeed12e2 100644 --- a/files/build/versions/host-image/versions-deb-buster-arm64 +++ b/files/build/versions/host-image/versions-deb-buster-arm64 @@ -4,6 +4,7 @@ dpkg-dev==1.19.7 gnupg==2.2.12-1+deb10u1 gnupg-l10n==2.2.12-1+deb10u1 gnupg-utils==2.2.12-1+deb10u1 +gnupg2==2.2.12-1+deb10u1 gpg==2.2.12-1+deb10u1 gpg-agent==2.2.12-1+deb10u1 gpg-wks-client==2.2.12-1+deb10u1 diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf index 8f75ca7fe9eb..fdf7ab9b15b9 100644 --- a/files/build/versions/host-image/versions-deb-buster-armhf +++ b/files/build/versions/host-image/versions-deb-buster-armhf @@ -4,6 +4,7 @@ dpkg-dev==1.19.7 gnupg==2.2.12-1+deb10u1 gnupg-l10n==2.2.12-1+deb10u1 gnupg-utils==2.2.12-1+deb10u1 +gnupg2==2.2.12-1+deb10u1 gpg==2.2.12-1+deb10u1 gpg-agent==2.2.12-1+deb10u1 gpg-wks-client==2.2.12-1+deb10u1 diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3 index 305880bbb81f..475ce37ba040 100644 --- a/files/build/versions/host-image/versions-py3 +++ b/files/build/versions/host-image/versions-py3 @@ -6,7 +6,7 @@ certifi==2022.6.15 cffi==1.15.1 charset-normalizer==2.1.0 click==7.0 -cryptography==37.0.2 +cryptography==37.0.4 docker==4.3.1 idna==3.3 ijson==2.6.1 @@ -32,13 +32,13 @@ pyroute2==0.5.14 python-dateutil==2.8.2 pyyaml==5.4.1 redis==3.5.3 -regex==2022.6.2 +regex==2022.7.9 requests==2.28.1 scapy==2.4.4 six==1.16.0 tabulate==0.8.10 thrift==0.13.0 -urllib3==1.26.9 +urllib3==1.26.10 watchdog==0.10.3 websocket-client==1.3.3 xmltodict==0.12.0 \ No newline at end of file