Fix internal merge conflict

Fix merge conflict introduced by public PR (sonic-net#13969)
Remove gnmi.timer

Author: ganglyu

.github/pull_request_template.md

@@ -12,10 +12,17 @@
 
 #### Why I did it
 
+##### Work item tracking
+- Microsoft ADO **(number only)**:
+
 #### How I did it
 
 #### How to verify it
 
+<!--
+If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012.
+-->
+
 #### Which release branch to backport (provide reason below if selected)
 
 <!--
@@ -34,13 +41,26 @@
 - [ ] 202205
 - [ ] 202211
 
+#### Tested branch (Please provide the tested image version)
+
+<!--
+- Please provide tested image version
+- e.g.
+- [x] 20201231.100
+-->
+
+- [ ] <!-- image version 1 -->
+- [ ] <!-- image version 2 -->
+
 #### Description for the changelog
 <!--
 Write a short (one line) summary that describes the changes in this
 pull request for inclusion in the changelog:
 -->
 
-#### Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
+<!--
+ Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
+-->
 
 #### Link to config_db schema for YANG module changes
 <!--

.gitignore

@@ -63,6 +63,12 @@ platform/**/*.egg-info
 platform/**/*-none-any.whl
 platform/**/.pybuild
 platform/**/debian/*
+!platform/**/debian/control
+!platform/**/debian/rules
+!platform/**/debian/changelog
+!platform/**/debian/compat
+!platform/**/debian/*.postinst
+!platform/**/debian/*.install
 platform/**/build
 platform/**/*.ko
 platform/**/*.mod.c

Makefile.work

@@ -224,6 +224,7 @@ PREPARE_DOCKER=BUILD_SLAVE=y \
 	DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) \
 	SONIC_VERSION_CACHE=$(SONIC_VERSION_CACHE) \
 	DBGOPT='$(DBGOPT)' \
+	MIRROR_SNAPSHOT=$(MIRROR_SNAPSHOT) \
 	scripts/prepare_docker_buildinfo.sh \
 		$(SLAVE_BASE_IMAGE) \
 		$(SLAVE_DIR)/Dockerfile \
@@ -565,6 +566,7 @@ SONIC_BUILD_INSTRUCTION :=  $(MAKE) \
                            GZ_COMPRESS_PROGRAM=$(GZ_COMPRESS_PROGRAM) \
                            MIRROR_SNAPSHOT=$(MIRROR_SNAPSHOT) \
                            SONIC_VERSION_CONTROL_COMPONENTS=$(SONIC_VERSION_CONTROL_COMPONENTS) \
+                           SONIC_OS_VERSION=$(SONIC_OS_VERSION) \
                            $(SONIC_OVERRIDE_BUILD_VARS)
 
 .PHONY: sonic-slave-build sonic-slave-bash init reset

build_debian.sh

@@ -602,6 +602,7 @@ export release="$(if [ -f $FILESYSTEM_ROOT/etc/sonic/sonic_release ]; then cat $
 export build_date="$(date -u)"
 export build_number="${BUILD_NUMBER:-0}"
 export built_by="$USER@$BUILD_HOSTNAME"
+export sonic_os_version="${SONIC_OS_VERSION}"
 j2 files/build_templates/sonic_version.yml.j2 | sudo tee $FILESYSTEM_ROOT/etc/sonic/sonic_version.yml
 
 ## Copy over clean-up script

files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye

@@ -15,8 +15,6 @@ libnl-genl-3-dev==3.5.0-1
 libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-dev==3.5.0-1
-libsai==1.11.0-1
-libsai-dev==1.11.0-1
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0

files/build/versions/default/versions-git

@@ -1,11 +1,11 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==019e73a13bf58542f2572daba6fbc5e389c40607
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==a896d5a92c67c826de7cb0a0afc96111614e40fd
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8
 https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
 https://github.com/flashrom/flashrom.git==3eaef7528b622955a48611fdc0801ca853665efd
-https://github.com/FreeRADIUS/freeradius-server.git==9884f1aa3847a32fd062fad51665ea98b88e83fc
+https://github.com/FreeRADIUS/freeradius-server.git==1b659443e6097835692be30d3d366eabd2d6077f
 https://github.com/FreeRADIUS/pam_radius.git==8d373539bb9f13b0abfe8bcae0095a930a00fad0
 https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39
 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7

files/build/versions/default/versions-mirror

@@ -1,15 +1,15 @@
 deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z
 deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z
-debian==20230409T000128Z
-debian-security==20230409T000248Z
-download.docker.com_linux_debian_dists_bullseye==2023-04-06T18:06:41Z
+debian==20230411T000410Z
+debian-security==20230411T000232Z
+download.docker.com_linux_debian_dists_bullseye==2023-04-11T20:00:38Z
 download.docker.com_linux_debian_dists_buster==2023-04-04T23:38:54Z
 packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z
-packages.trafficmanager.net_snapshot_debian-security_20230409T000248Z_dists_bullseye-security==2023-04-07T20:22:40Z
-packages.trafficmanager.net_snapshot_debian-security_20230409T000248Z_dists_buster_updates==2023-04-07T20:22:40Z
-packages.trafficmanager.net_snapshot_debian_20230409T000128Z_dists_bullseye==2022-12-17T10:14:37Z
-packages.trafficmanager.net_snapshot_debian_20230409T000128Z_dists_bullseye-backports==2023-04-08T20:12:51Z
-packages.trafficmanager.net_snapshot_debian_20230409T000128Z_dists_bullseye-updates==2023-04-08T20:12:51Z
-packages.trafficmanager.net_snapshot_debian_20230409T000128Z_dists_buster==2022-09-10T11:30:54Z
-packages.trafficmanager.net_snapshot_debian_20230409T000128Z_dists_buster-backports==2023-04-08T20:12:51Z
-packages.trafficmanager.net_snapshot_debian_20230409T000128Z_dists_buster-updates==2023-04-08T20:12:51Z
+packages.trafficmanager.net_snapshot_debian-security_20230411T000232Z_dists_bullseye-security==2023-04-10T18:02:36Z
+packages.trafficmanager.net_snapshot_debian-security_20230411T000232Z_dists_buster_updates==2023-04-10T18:02:36Z
+packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_bullseye==2022-12-17T10:14:37Z
+packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_bullseye-backports==2023-04-10T20:09:25Z
+packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_bullseye-updates==2023-04-10T20:09:25Z
+packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_buster==2022-09-10T11:30:54Z
+packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_buster-backports==2023-04-10T20:09:25Z
+packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_buster-updates==2023-04-10T20:09:25Z

files/build/versions/dockers/docker-config-engine-buster/versions-py3

@@ -1,7 +1,7 @@
 async-timeout==4.0.2
 bitarray==1.5.3
 ijson==2.6.1
-importlib-metadata==6.2.1
+importlib-metadata==6.3.0
 ipaddress==1.0.23
 jsondiff==2.0.0
 lxml==4.9.1

files/build/versions/dockers/docker-sonic-vs/versions-py3

@@ -23,7 +23,7 @@ prefixed==0.7.0
 prettyprinter==0.18.0
 ptyprocess==0.7.0
 pycairo==1.23.0
-pygments==2.14.0
+pygments==2.15.0
 pygobject==3.44.1
 pyroute2==0.5.14
 redis==4.5.2

files/build/versions/dockers/sonic-slave-bullseye/versions-py3

@@ -66,7 +66,7 @@ pyangbind==0.8.1
 pyasn1==0.4.8
 pyasn1-modules==0.2.1
 pycurl==7.43.0.6
-pyfakefs==5.2.0
+pyfakefs==5.2.1
 pygments==2.7.1
 pygobject==3.38.0
 pyhamcrest==1.9.0