202311_RC_err_-5_fix_validation

.azure-pipelines/azure-pipelines-Official.yml

@@ -14,7 +14,7 @@ schedules:
  - 202012
  always: true
 
-pool: sonicbld
+pool: sonicbld-1es
 
 stages:
 - stage: Build

.azure-pipelines/azure-pipelines-UpgrateVersion.yml

@@ -26,14 +26,13 @@ resources:
  ref: master
  endpoint: sonic-net
 
-pool: sonicbld
+pool: sonicbld-1es
 
 parameters:
 - name: 'jobFilters'
  type: object
  default:
  - vs
- - barefoot
  - broadcom
  - centec
  - centec-arm64

.azure-pipelines/azure-pipelines-build-ubuntu-2004.yml

@@ -9,6 +9,16 @@ trigger:
  branches:
  include:
  - master
+ - 202???
+
+schedules:
+- cron: "0 0 * * *"
+ displayName: Daily build
+ branches:
+ include:
+ - master
+ - 202???
+ always: true
 
 stages:
 - stage: Build
@@ -28,13 +38,14 @@ stages:
  cmake pkg-config python3-pip python cmake libgtest-dev libgmock-dev libyang-dev \
  debhelper-compat dh-elpa dh-sequence-python3 python3-all \
  libpython3-all-dev python3-six xmlto unzip rake-compiler gem2deb pkg-php-tools \
- ant default-jdk maven-repo-helper libguava-java
+ ant default-jdk maven-repo-helper libguava-java \
+ libboost-all-dev libgtest-dev build-essential
  wget http://ftp.us.debian.org/debian/pool/main/libg/libgoogle-gson-java/libgoogle-gson-java_2.8.6-1+deb11u1_all.deb
  sudo dpkg -i libgoogle-gson-java_2.8.6-1+deb11u1_all.deb
  mkdir -p /tmp/artifacts
  displayName: "Install dependencies"
  - script: |
- SONIC_CONFIG_MAKE_JOBS=$(nproc) CONFIGURED_ARCH=amd64 DEST=/tmp/artifacts make -f ../rules/protobuf.mk -f protobuf/Makefile
+ BLDENV=bullseye SONIC_CONFIG_MAKE_JOBS=$(nproc) CONFIGURED_ARCH=amd64 DEST=/tmp/artifacts make -f ../rules/protobuf.mk -f protobuf/Makefile
  workingDirectory: src
  displayName: "Build protobuf"
  - script: |

.azure-pipelines/azure-pipelines-image-template.yml

@@ -30,7 +30,7 @@ jobs:
  - script: |
  [ -n "$OVERRIDE_BUILD_OPTIONS" ] && OVERRIDE_BUILD_OPTIONS=$(OVERRIDE_BUILD_OPTIONS)
  BUILD_OPTIONS="$(BUILD_OPTIONS) $OVERRIDE_BUILD_OPTIONS"
- if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-armhf)$"; then
+ if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-armhf|marvell-arm64)$"; then
  CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=$(CACHE_MODE) SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/$(PLATFORM_AZP)"
  BUILD_OPTIONS="$BUILD_OPTIONS $CACHE_OPTIONS"
  fi

.azure-pipelines/build-template.yml

@@ -35,9 +35,9 @@ parameters:
 - name: pool
  type: string
  values:
- - sonicbld
+ - sonicbld-1es
  - sonicbld_8c
- default: sonicbld
+ default: sonicbld-1es
 
 - name: dbg_image
  type: boolean

.azure-pipelines/docker-sonic-mgmt-py3-only.yml

@@ -32,7 +32,7 @@ stages:
 - stage: Build
  jobs:
  - job: Build
- pool: sonicbld
+ pool: sonicbld-1es
  timeoutInMinutes: 360
  steps:
  - template: cleanup.yml

.azure-pipelines/docker-sonic-mgmt.yml

@@ -32,7 +32,7 @@ stages:
 - stage: Build
  jobs:
  - job: Build
- pool: sonicbld
+ pool: sonicbld-1es
  timeoutInMinutes: 360
  steps:
  - template: cleanup.yml

.azure-pipelines/docker-sonic-slave-template.yml

@@ -28,9 +28,9 @@ parameters:
  default: sonicdev
 - name: pool
  type: string
- default: sonicbld
+ default: sonicbld-1es
  values:
- - sonicbld
+ - sonicbld-1es
  - sonicbld-arm64
  - sonicbld-armhf
 

.azure-pipelines/docker-sonic-slave.yml

@@ -63,7 +63,7 @@ stages:
  - ${{ each arch in parameters.arches }}:
  - template: .azure-pipelines/docker-sonic-slave-template.yml@buildimage
  parameters:
- pool: sonicbld
+ pool: sonicbld-1es
  arch: ${{ arch }}
  dist: ${{ dist }}
  ${{ if ne(arch, 'amd64') }}:

.azure-pipelines/dpkg-cache-cleanup.yml

@@ -16,7 +16,7 @@ pr: none
 
 jobs:
 - job: Amd
- pool: sonicbld
+ pool: sonicbld-1es
  timeoutInMinutes: 5
  steps:
  - checkout: none

.azure-pipelines/official-build-cache.yml

@@ -24,7 +24,7 @@ pr: none
 
 stages:
 - stage: Build
- pool: sonicbld
+ pool: sonicbld-1es
  variables:
  - name: CACHE_MODE
  value: cache

.azure-pipelines/official-build.yml

@@ -34,7 +34,7 @@ variables:
 
 stages:
 - stage: Build
- pool: sonicbld
+ pool: sonicbld-1es
  variables:
  - name: CACHE_MODE
  value: wcache

.azure-pipelines/template-commonlib.yml

@@ -11,7 +11,7 @@ jobs:
  - job: Build_${{ arch }}
  timeoutInMinutes: 120
  ${{ if eq(arch,'amd64') }}:
- pool: sonicbld
+ pool: sonicbld-1es
  ${{ else }}:
  pool: sonicbld-${{ arch }}
  variables:

.gitmodules

@@ -1,15 +1,19 @@
 [submodule "sonic-swss-common"]
  path = src/sonic-swss-common
  url = https://github.com/sonic-net/sonic-swss-common
+ branch = 202311
 [submodule "sonic-linux-kernel"]
  path = src/sonic-linux-kernel
  url = https://github.com/sonic-net/sonic-linux-kernel
+ branch = 202311
 [submodule "sonic-sairedis"]
  path = src/sonic-sairedis
  url = https://github.com/sonic-net/sonic-sairedis
+ branch = 202311
 [submodule "sonic-swss"]
  path = src/sonic-swss
- url = https://github.com/sonic-net/sonic-swss
+ url = https://github.com/nvidia-sonic/sonic-swss
+ branch = 202311
 [submodule "src/p4c-bm/p4c-bm"]
  path = platform/p4/p4c-bm/p4c-bm
  url = https://github.com/krambn/p4c-bm
@@ -19,27 +23,33 @@
 [submodule "sonic-dbsyncd"]
  path = src/sonic-dbsyncd
  url = https://github.com/sonic-net/sonic-dbsyncd
+ branch = 202311
 [submodule "src/sonic-py-swsssdk"]
  path = src/sonic-py-swsssdk
  url = https://github.com/sonic-net/sonic-py-swsssdk.git
+ branch = 202311
 [submodule "src/sonic-snmpagent"]
  path = src/sonic-snmpagent
  url = https://github.com/sonic-net/sonic-snmpagent
+ branch = 202311
 [submodule "src/ptf"]
  path = src/ptf
  url = https://github.com/p4lang/ptf.git
 [submodule "src/sonic-utilities"]
  path = src/sonic-utilities
- url = https://github.com/sonic-net/sonic-utilities
+ url = https://github.com/nvidia-sonic/sonic-utilities
+ branch = 202311
 [submodule "platform/broadcom/sonic-platform-modules-arista"]
  path = platform/broadcom/sonic-platform-modules-arista
  url = https://github.com/aristanetworks/sonic
 [submodule "src/sonic-platform-common"]
  path = src/sonic-platform-common
- url = https://github.com/sonic-net/sonic-platform-common
+ url = https://github.com/nvidia-sonic/sonic-platform-common
+ branch = 202311
 [submodule "src/sonic-platform-daemons"]
  path = src/sonic-platform-daemons
  url = https://github.com/sonic-net/sonic-platform-daemons
+ branch = 202311
 [submodule "src/sonic-platform-pde"]
  path = src/sonic-platform-pde
  url = https://github.com/sonic-net/sonic-platform-pdk-pde
@@ -74,7 +84,7 @@
 [submodule "src/sonic-restapi"]
  path = src/sonic-restapi
  url = https://github.com/sonic-net/sonic-restapi.git
- branch = master
+ branch = 202311
 [submodule "src/sonic-mgmt-common"]
  path = src/sonic-mgmt-common
  url = https://github.com/sonic-net/sonic-mgmt-common.git
@@ -91,6 +101,7 @@
 [submodule "src/linkmgrd"]
  path = src/linkmgrd
  url = https://github.com/sonic-net/sonic-linkmgrd.git
+ branch = 202311
 [submodule "src/sonic-p4rt/sonic-pins"]
  path = src/sonic-p4rt/sonic-pins
  url = https://github.com/sonic-net/sonic-pins.git
@@ -100,21 +111,26 @@
 [submodule "src/dhcprelay"]
  path = src/dhcprelay
  url = https://github.com/sonic-net/sonic-dhcp-relay.git
+ branch = 202311
 [submodule "src/sonic-host-services"]
  path = src/sonic-host-services
  url = https://github.com/sonic-net/sonic-host-services
+ branch = 202311
 [submodule "src/sonic-gnmi"]
  path = src/sonic-gnmi
  url = https://github.com/sonic-net/sonic-gnmi.git
+ branch = 202311
 [submodule "src/sonic-genl-packet"]
  path = src/sonic-genl-packet
  url = https://github.com/sonic-net/sonic-genl-packet
 [submodule "src/dhcpmon"]
  path = src/dhcpmon
  url = https://github.com/sonic-net/sonic-dhcpmon.git
-[submodule "src/sonic-dash-api/sonic-dash-api"]
- path = src/sonic-dash-api/sonic-dash-api
+ branch = 202311
+[submodule "src/sonic-dash-api"]
+ path = src/sonic-dash-api
  url = https://github.com/sonic-net/sonic-dash-api.git
+ branch = 202311
 [submodule "platform/marvell-arm64/mrvl-prestera"]
  path = platform/marvell-arm64/mrvl-prestera
  url = https://github.com/Marvell-switching/mrvl-prestera.git

Makefile.work

@@ -40,6 +40,9 @@
 # * ENABLE_NATIVE_WRITE: Enable native write/config operations via the gNMI interface.
 # * Default: unset
 # * Values: y
+# * ENABLE_DIALOUT: Enable dialout client in telemetry.
+# * Default: unset
+# * Values: y
 # * SONIC_DPKG_CACHE_METHOD: Specifying method of obtaining the Debian packages from cache: none or cache
 # * SONIC_DPKG_CACHE_SOURCE: Debian package cache location when cache enabled for debian packages
 # * BUILD_LOG_TIMESTAMP: Set timestamp in the build log (simple/none)
@@ -518,6 +521,7 @@ SONIC_BUILD_INSTRUCTION := $(MAKE) \
  INCLUDE_KUBERNETES=$(INCLUDE_KUBERNETES) \
  KUBERNETES_VERSION=$(KUBERNETES_VERSION) \
  KUBERNETES_CNI_VERSION=$(KUBERNETES_CNI_VERSION) \
+ KUBERNETES_CRI_TOOLS_VERSION=$(KUBERNETES_CRI_TOOLS_VERSION) \
  K8s_GCR_IO_PAUSE_VERSION=$(K8s_GCR_IO_PAUSE_VERSION) \
  INCLUDE_KUBERNETES_MASTER=$(INCLUDE_KUBERNETES_MASTER) \
  SONIC_ENABLE_PFCWD_ON_START=$(ENABLE_PFCWD_ON_START) \
@@ -544,13 +548,15 @@ SONIC_BUILD_INSTRUCTION := $(MAKE) \
  SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD=$(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD) \
  SONIC_INCLUDE_SYSTEM_TELEMETRY=$(INCLUDE_SYSTEM_TELEMETRY) \
  SONIC_INCLUDE_SYSTEM_GNMI=$(INCLUDE_SYSTEM_GNMI) \
+ SONIC_INCLUDE_SYSTEM_EVENTD=$(INCLUDE_SYSTEM_EVENTD) \
  INCLUDE_DHCP_RELAY=$(INCLUDE_DHCP_RELAY) \
  INCLUDE_DHCP_SERVER=$(INCLUDE_DHCP_SERVER) \
  INCLUDE_MACSEC=$(INCLUDE_MACSEC) \
  SONIC_INCLUDE_RESTAPI=$(INCLUDE_RESTAPI) \
  SONIC_INCLUDE_MUX=$(INCLUDE_MUX) \
  ENABLE_TRANSLIB_WRITE=$(ENABLE_TRANSLIB_WRITE) \
  ENABLE_NATIVE_WRITE=$(ENABLE_NATIVE_WRITE) \
+ ENABLE_DIALOUT=$(ENABLE_DIALOUT) \
  EXTRA_DOCKER_TARGETS=$(EXTRA_DOCKER_TARGETS) \
  BUILD_LOG_TIMESTAMP=$(BUILD_LOG_TIMESTAMP) \
  SONIC_ENABLE_IMAGE_SIGNATURE=$(ENABLE_IMAGE_SIGNATURE) \