Merge branch 'master' into sonic_warmrestart

Signed-off-by: Arthi Sivanantham <[email protected]>

Author: Arthi Sivanantham

.azure-pipelines/azure-pipelines-build.yml

@@ -65,7 +65,7 @@ jobs:
 
         - name: centec-arm64
           pool: sonicbld_8c
-          timeoutInMinutes: 2160
+          timeoutInMinutes: 2880
           variables:
             PLATFORM_ARCH: arm64
 
@@ -79,7 +79,7 @@ jobs:
 
         - name: marvell-armhf
           pool: sonicbld_8c
-          timeoutInMinutes: 2160
+          timeoutInMinutes: 2880
           variables:
             PLATFORM_ARCH: armhf
 

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

@@ -44,7 +44,7 @@ jobs:
           sudo modprobe overlay
           sudo apt-get install -y acl
           sudo bash -c "echo 1 > /proc/sys/vm/compact_memory"
-          ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$(PLATFORM_AZP) PLATFORM_ARCH=$(PLATFORM_ARCH) configure
+          ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$(PLATFORM_AZP) PLATFORM_ARCH=$(PLATFORM_ARCH) $(BUILD_OPTIONS) configure
         displayName: 'Make configure'
     postSteps:
       - script: cp target -r $(Build.ArtifactStagingDirectory)/

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

@@ -22,6 +22,7 @@ pr:
     - sonic-slave-jessie
     - sonic-slave-stretch
     - sonic-slave-buster
+    - sonic-slave-bullseye
 
 parameters:
 - name: 'arches'
@@ -33,6 +34,7 @@ parameters:
 - name: 'dists'
   type: object
   default:
+  - bullseye
   - buster
   - stretch
   - jessie
@@ -43,6 +45,11 @@ parameters:
   type: string
   default: sonicdev
 
+variables:
+- ${{ if eq(variables['Build.SourceBranchName'], '202012' }}:
+  - name: BUILD_OPTIONS
+    value: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
+
 stages:
 - stage: Build
   jobs:
@@ -81,7 +88,7 @@ stages:
 
               echo ${{ arch }} > .arch
 
-              DOCKER_DATA_ROOT_FOR_MULTIARCH=/data/march/docker BLDENV=${{ dist }} make -f Makefile.work sonic-slave-build | tee $tmpfile
+              DOCKER_DATA_ROOT_FOR_MULTIARCH=/data/march/docker BLDENV=${{ dist }} $(BUILD_OPTIONS) make -f Makefile.work sonic-slave-build | tee $tmpfile
               SLAVE_BASE_TAG=$(grep "^Checking sonic-slave-base image:" $tmpfile | awk -F ':' '{print $3}')
               SLAVE_TAG=$(grep "^Checking sonic-slave image:" $tmpfile | awk -F ':' '{print $3}')
 

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

@@ -0,0 +1,37 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+schedules:
+- cron: "0 */6 * * *"
+  displayName: Build cache quickly
+  branches:
+    include:
+    - master
+    - 202012
+
+trigger: none
+pr: none
+
+stages:
+- stage: Build
+  pool: sonicbld
+  variables:
+    CACHE_MODE: cache
+  jobs:
+  - template: azure-pipelines-build.yml
+    parameters:
+      buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) ${{ variables.VERSION_CONTROL_OPTIONS }}'
+      jobGroups:
+        - name: vs
+        - name: broadcom
+          variables:
+            swi_image: yes
+            raw_image: yes
+            docker_syncd_rpc_image: yes
+            platform_rpc: brcm
+        - name: mellanox
+          variables:
+            docker_syncd_rpc_image: yes
+            platform_rpc: mlnx

.github/pull_request_template.md

@@ -29,6 +29,7 @@
 - [ ] 201911
 - [ ] 202006
 - [ ] 202012
+- [ ] 202106
 
 #### Description for the changelog
 <!--

.gitignore

@@ -74,6 +74,7 @@ platform/broadcom/sonic-platform-modules-dell/s6100/modules/dell_s6100_lpc.c
 platform/broadcom/sonic-platform-modules-dell/z9100/modules/dell_ich.c
 platform/broadcom/sonic-platform-modules-dell/z9100/modules/dell_mailbox.c
 platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/ipmihelper.py
+platform/cisco-8000
 
 # buildinfo
 files/build/buildinfo

.gitmodules

@@ -16,10 +16,6 @@
 [submodule "src/p4-hlir/p4-hlir"]
 	path = platform/p4/p4-hlir/p4-hlir
 	url = https://github.com/p4lang/p4-hlir
-[submodule "quagga"]
-	path = src/sonic-quagga
-	url = https://github.com/Azure/sonic-quagga
-	branch = debian/0.99.24.1
 [submodule "sonic-dbsyncd"]
 	path = src/sonic-dbsyncd
 	url = https://github.com/Azure/sonic-dbsyncd
@@ -44,6 +40,9 @@
 [submodule "src/sonic-platform-daemons"]
 	path = src/sonic-platform-daemons
 	url = https://github.com/Azure/sonic-platform-daemons
+[submodule "src/sonic-platform-pde"]
+	path = src/sonic-platform-pde
+	url = https://github.com/Azure/sonic-platform-pdk-pde
 [submodule "src/sonic-frr/frr"]
 	path = src/sonic-frr/frr
 	url = https://github.com/Azure/sonic-frr.git
@@ -88,3 +87,10 @@
 [submodule "src/wpasupplicant/sonic-wpa-supplicant"]
 	path = src/wpasupplicant/sonic-wpa-supplicant
 	url = https://github.com/Azure/sonic-wpa-supplicant.git
+[submodule "platform/broadcom/saibcm-modules-dnx"]
+	path = platform/broadcom/saibcm-modules-dnx
+	url = https://github.com/Azure/saibcm-modules.git
+	branch =  sdk-6.5.22-gpl-dnx
+[submodule "platform/broadcom/sonic-platform-modules-nokia"]
+	path = platform/broadcom/sonic-platform-modules-nokia
+	url = https://github.com/nokia/sonic-platform.git

Makefile

@@ -2,6 +2,29 @@
 
 NOJESSIE ?= 1
 NOSTRETCH ?= 0
+NOBUSTER ?= 0
+NOBULLSEYE ?= 1
+
+ifeq ($(NOJESSIE),0)
+BUILD_JESSIE=1
+endif
+
+ifeq ($(NOSTRETCH),0)
+BUILD_STRETCH=1
+endif
+
+ifeq ($(NOBUSTER),0)
+BUILD_BUSTER=1
+endif
+
+ifeq ($(NOBULLSEYE),0)
+BUILD_BULLSEYE=1
+endif
+
+PLATFORM_PATH := platform/$(if $(PLATFORM),$(PLATFORM),$(CONFIGURED_PLATFORM))
+PLATFORM_CHECKOUT := platform/checkout
+PLATFORM_CHECKOUT_FILE := $(PLATFORM_CHECKOUT)/$(PLATFORM).ini
+PLATFORM_CHECKOUT_CMD := $(shell if [ -f $(PLATFORM_CHECKOUT_FILE) ]; then PLATFORM_PATH=$(PLATFORM_PATH) j2 $(PLATFORM_CHECKOUT)/template.j2 $(PLATFORM_CHECKOUT_FILE); fi)
 
 %::
 	@echo "+++ --- Making $@ --- +++"
@@ -11,7 +34,12 @@ endif
 ifeq ($(NOSTRETCH), 0)
 	EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=stretch make -f Makefile.work stretch
 endif
+ifeq ($(NOBUSTER), 0)
 	BLDENV=buster make -f Makefile.work $@
+endif
+ifeq ($(NOBULLSEYE), 0)
+	BLDENV=bullseye make -f Makefile.work $@
+endif
 
 jessie:
 	@echo "+++ Making $@ +++"
@@ -25,19 +53,38 @@ ifeq ($(NOSTRETCH), 0)
 	make -f Makefile.work stretch
 endif
 
+buster:
+	@echo "+++ Making $@ +++"
+ifeq ($(NOBUSTER), 0)
+	make -f Makefile.work buster
+endif
+
 init:
 	@echo "+++ Making $@ +++"
 	make -f Makefile.work $@
 
-clean configure reset showtag sonic-slave-build sonic-slave-bash :
+#
+# Function to invoke target $@ in Makefile.work with proper BLDENV
+#
+define make_work
 	@echo "+++ Making $@ +++"
-ifeq ($(NOJESSIE), 0)
-	make -f Makefile.work $@
-endif
-ifeq ($(NOSTRETCH), 0)
-	BLDENV=stretch make -f Makefile.work $@
-endif
-	BLDENV=buster make -f Makefile.work $@
+	$(if $(BUILD_JESSIE),make -f Makefile.work $@,)
+	$(if $(BUILD_STRETCH),BLDENV=stretch make -f Makefile.work $@,)
+	$(if $(BUILD_BUSTER),BLDENV=buster make -f Makefile.work $@,)
+	$(if $(BUILD_BULLSEYE),BLDENV=bullseye make -f Makefile.work $@,)
+endef
+
+.PHONY: $(PLATFORM_PATH)
+
+$(PLATFORM_PATH):
+	@echo "+++ Cheking $@ +++"
+	$(PLATFORM_CHECKOUT_CMD)
+
+configure : $(PLATFORM_PATH)
+	$(call make_work, $@)
+
+clean reset showtag sonic-slave-build sonic-slave-bash :
+	$(call make_work, $@)
 
 # Freeze the versions, see more detail options: scripts/versions_manager.py freeze -h
 freeze:

Makefile.work

@@ -47,12 +47,13 @@ SHELL = /bin/bash
 USER := $(shell id -un)
 PWD := $(shell pwd)
 USER_LC := $(shell echo $(USER) | tr A-Z a-z)
+DOCKER_MACHINE := $(shell docker run --rm debian:buster uname -m)
 
 comma := ,
 
-ifeq ($(shell uname -m), aarch64)
+ifeq ($(DOCKER_MACHINE), aarch64)
 COMPILE_HOST_ARCH := arm64
-else ifeq ($(shell uname -m), armv7l)
+else ifeq ($(shell echo $(DOCKER_MACHINE) | grep -qE "armv7l|armv8l" && echo y),y)
 COMPILE_HOST_ARCH := armhf
 else
 COMPILE_HOST_ARCH := amd64
@@ -92,7 +93,9 @@ ifeq ($(PLATFORM_ARCH),)
 	override PLATFORM_ARCH = $(CONFIGURED_ARCH)
 endif
 
-ifeq ($(BLDENV), buster)
+ifeq ($(BLDENV), bullseye)
+SLAVE_DIR = sonic-slave-bullseye
+else ifeq ($(BLDENV), buster)
 SLAVE_DIR = sonic-slave-buster
 else ifeq ($(BLDENV), stretch)
 SLAVE_DIR = sonic-slave-stretch
@@ -247,6 +250,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
                            SONIC_IMAGE_VERSION=$(SONIC_IMAGE_VERSION) \
                            ENABLE_DHCP_GRAPH_SERVICE=$(ENABLE_DHCP_GRAPH_SERVICE) \
                            ENABLE_ZTP=$(ENABLE_ZTP) \
+                           INCLUDE_PDE=$(INCLUDE_PDE) \
                            SHUTDOWN_BGP_ON_START=$(SHUTDOWN_BGP_ON_START) \
                            INCLUDE_KUBERNETES=$(INCLUDE_KUBERNETES) \
                            KUBERNETES_VERSION=$(KUBERNETES_VERSION) \
@@ -268,6 +272,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
                            HTTPS_PROXY=$(https_proxy) \
                            NO_PROXY=$(no_proxy) \
                            SONIC_INCLUDE_SYSTEM_TELEMETRY=$(INCLUDE_SYSTEM_TELEMETRY) \
+                           INCLUDE_DHCP_RELAY=$(INCLUDE_DHCP_RELAY) \
                            SONIC_INCLUDE_RESTAPI=$(INCLUDE_RESTAPI) \
                            TELEMETRY_WRITABLE=$(TELEMETRY_WRITABLE) \
                            EXTRA_DOCKER_TARGETS=$(EXTRA_DOCKER_TARGETS) \
@@ -282,7 +287,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
 .DEFAULT_GOAL :=  all
 
 %::
-ifneq (,$(filter $(CONFIGURED_ARCH), armhf arm64))
+ifeq ($(MULTIARCH_QEMU_ENVIRON), y)
 	@$(DOCKER_MULTIARCH_CHECK)
 ifneq ($(BLDENV), )
 	@$(DOCKER_SERVICE_MULTIARCH_CHECK)
@@ -357,7 +362,7 @@ reset :
 	    if [ $$ans == y ]; then
 	        echo "Resetting local repository. Please wait...";
 	        $(DOCKER_RUN) $(SLAVE_IMAGE):$(SLAVE_TAG) sudo rm -rf fsroot;
-	        if [[ "$(CONFIGURED_ARCH)" == "armhf" || "$(CONFIGURED_ARCH)" ==  "arm64" ]]; then
+	        if [ "$(MULTIARCH_QEMU_ENVIRON)" == y ] && [[ "$(CONFIGURED_ARCH)" == "armhf" || "$(CONFIGURED_ARCH)" ==  "arm64" ]]; then
 	            echo "Stopping march $(CONFIGURED_ARCH) docker"
 	            sudo kill -9 `sudo cat /var/run/march/docker.pid` || true
 	            sudo rm -f /var/run/march/docker.pid || true