Merge branch 'v2' of https://github.com/Yagami-Jiang/sonic-buildimage …

…into v2
sonic-net · Apr 10, 2023 · 2953ebf · 2953ebf
2 parents e0b3759 + 31abf62
commit 2953ebf
Show file tree

Hide file tree

Showing 163 changed files with 1,708 additions and 3,542 deletions.
diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
@@ -125,7 +125,7 @@ jobs:
             make $BUILD_OPTIONS target/docker-ptf-sai.gz
             if [ $(Build.Reason) != 'PullRequest' ];then
               gzip -kd target/sonic-vs.img.gz
-              SONIC_RUN_CMDS="qemu-img convert target/sonic-vs.img -O vhdx -o subformat=dynamic target/sonic-vs.vhdx" make sonic-slave-run
+              SONIC_RUN_CMDS="qemu-img convert target/sonic-vs.img -O vhdx -o subformat=dynamic target/sonic-vs.vhdx" make $BUILD_OPTIONS sonic-slave-run
               rm target/sonic-vs.img
             fi
           else

diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml
@@ -28,11 +28,12 @@ jobs:
       - template: .azure-pipelines/cleanup.yml@buildimage
       - ${{ parameters.preSteps }}
       - script: |
+          BUILD_OPTIONS="$(BUILD_OPTIONS)"
           if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-armhf)$"; then
             CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=$(CACHE_MODE) SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/$(PLATFORM_AZP)"
             BUILD_OPTIONS="$(BUILD_OPTIONS) $CACHE_OPTIONS"
-            echo "##vso[task.setvariable variable=BUILD_OPTIONS]$BUILD_OPTIONS"
           fi
+          echo "##vso[task.setvariable variable=BUILD_OPTIONS]$BUILD_OPTIONS"
         displayName: "Set cache options"
       - checkout: self
         submodules: recursive

diff --git a/.azure-pipelines/run-test-scheduler-template.yml b/.azure-pipelines/run-test-scheduler-template.yml
@@ -48,13 +48,13 @@ parameters:
 
 steps:
   - script: |
-      set -ex
+      set -e
       wget -O ./.azure-pipelines/test_plan.py  https://github.com/sonic-net/sonic-mgmt/master/.azure-pipelines/test_plan.py
       wget -O ./.azure-pipelines/pr_test_scripts.yaml  https://github.com/sonic-net/sonic-mgmt/master/.azure-pipelines/pr_test_scripts.yaml
     displayName: Download TestbedV2 scripts
 
   - script: |
-      set -ex
+      set -e
       pip install PyYAML
       rm -f new_test_plan_id.txt
       python ./.azure-pipelines/test_plan.py create -t ${{ parameters.TOPOLOGY }} -o new_test_plan_id.txt \
@@ -76,45 +76,45 @@ steps:
     displayName: Trigger test
 
   - script: |
-      set -ex
+      set -e
       echo "Lock testbed"
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
-      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
+      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID "
       # When "LOCK_TESTBED" finish, it changes into "PREPARE_TESTBED"
       python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state LOCK_TESTBED
     env:
       TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
     displayName: Lock testbed
 
   - script: |
-      set -ex
+      set -e
       echo "Prepare testbed"
       echo "Preparing the testbed(add-topo, deploy-mg) may take 15-30 minutes. Before the testbed is ready, the progress of the test plan keeps displayed as 0, please be patient(We will improve the indication in a short time)"
       echo "If the progress keeps as 0 for more than 1 hour, please cancel and retry this pipeline"
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
-      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
+      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID "
       # When "PREPARE_TESTBED" finish, it changes into "EXECUTING"
       python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state PREPARE_TESTBED
     env:
       TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
     displayName: Prepare testbed
 
   - script: |
-      set -ex
+      set -e
       echo "Run test"
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
-      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
+      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID "
       # When "EXECUTING" finish, it changes into "KVMDUMP", "FAILED", "CANCELLED" or "FINISHED"
       python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state EXECUTING
     env:
       TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
     displayName: Run test
 
   - script: |
-      set -ex
+      set -e
       echo "KVM dump"
       echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com"
-      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID"
+      echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID "
       # When "KVMDUMP" finish, it changes into "FAILED", "CANCELLED" or "FINISHED"
       python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state KVMDUMP
     condition: succeededOrFailed()
@@ -123,7 +123,7 @@ steps:
     displayName: KVM dump
 
   - script: |
-      set -ex
+      set -e
       echo "Try to cancel test plan $TEST_PLAN_ID, cancelling finished test plan has no effect."
       python ./.azure-pipelines/test_plan.py cancel -i "$(TEST_PLAN_ID)"
     condition: always()

diff --git a/.gitmodules b/.gitmodules
@@ -112,3 +112,6 @@
 [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
diff --git a/Makefile.work b/Makefile.work
@@ -245,6 +245,7 @@ SLAVE_BASE_TAG = $(shell \
 SLAVE_TAG = $(shell \
 	(cat $(SLAVE_DIR)/Dockerfile.user \
 		 $(SLAVE_DIR)/Dockerfile \
+		 $(SLAVE_DIR)/sources.list.* \
 		 $(SLAVE_DIR)/buildinfo/versions/versions-* \
 	&& echo $(USER)/$(PWD)/$(CONFIGURED_PLATFORM)) \
 	| sha1sum \
@@ -414,7 +415,7 @@ endif
 
 endif
 
-SPLIT_LOG = | tee
+SPLIT_LOG = 2>&1 | tee
 
 DOCKER_BASE_LOG = $(SLAVE_DIR)/$(SLAVE_BASE_IMAGE)_$(SLAVE_BASE_TAG).log
 DOCKER_LOG = $(SLAVE_DIR)/$(SLAVE_IMAGE)_$(SLAVE_TAG).log

diff --git a/...86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm b/...86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm
@@ -426,46 +426,61 @@ port_init_speed_cc.BCM8869X=200000
 port_init_speed_cd.BCM8869X=400000
 port_init_speed_il.BCM8869X=10312
 
-#ucode_port_100.BCM8869X=RCY_MIRROR.0:core_0.100
-#ucode_port_101.BCM8869X=RCY_MIRROR.1:core_0.101
-#ucode_port_102.BCM8869X=RCY_MIRROR.2:core_0.102
-#ucode_port_103.BCM8869X=RCY_MIRROR.3:core_0.103
-#ucode_port_104.BCM8869X=RCY_MIRROR.4:core_0.104
-#ucode_port_105.BCM8869X=RCY_MIRROR.5:core_0.105
-#ucode_port_106.BCM8869X=RCY_MIRROR.6:core_0.106
-#ucode_port_107.BCM8869X=RCY_MIRROR.7:core_0.107
-#ucode_port_108.BCM8869X=RCY_MIRROR.8:core_0.108
-#ucode_port_109.BCM8869X=RCY_MIRROR.9:core_0.109
-#ucode_port_110.BCM8869X=RCY_MIRROR.10:core_0.110
-#ucode_port_111.BCM8869X=RCY_MIRROR.11:core_0.111
-#ucode_port_112.BCM8869X=RCY_MIRROR.12:core_0.112
-#ucode_port_113.BCM8869X=RCY_MIRROR.13:core_0.113
-#ucode_port_114.BCM8869X=RCY_MIRROR.14:core_0.114
-#ucode_port_115.BCM8869X=RCY_MIRROR.15:core_0.115
-#ucode_port_116.BCM8869X=RCY_MIRROR.16:core_0.116
-#ucode_port_117.BCM8869X=RCY_MIRROR.17:core_0.117
-#ucode_port_118.BCM8869X=RCY_MIRROR.18:core_0.118
-#ucode_port_119.BCM8869X=RCY_MIRROR.19:core_0.119
-#ucode_port_120.BCM8869X=RCY_MIRROR.0:core_1.120
-#ucode_port_121.BCM8869X=RCY_MIRROR.1:core_1.121
-#ucode_port_122.BCM8869X=RCY_MIRROR.2:core_1.122
-#ucode_port_123.BCM8869X=RCY_MIRROR.3:core_1.123
-#ucode_port_124.BCM8869X=RCY_MIRROR.4:core_1.124
-#ucode_port_125.BCM8869X=RCY_MIRROR.5:core_1.125
-#ucode_port_126.BCM8869X=RCY_MIRROR.6:core_1.126
-#ucode_port_127.BCM8869X=RCY_MIRROR.7:core_1.127
-#ucode_port_128.BCM8869X=RCY_MIRROR.8:core_1.128
-#ucode_port_129.BCM8869X=RCY_MIRROR.9:core_1.129
-#ucode_port_130.BCM8869X=RCY_MIRROR.10:core_1.130
-#ucode_port_131.BCM8869X=RCY_MIRROR.11:core_1.131
-#ucode_port_132.BCM8869X=RCY_MIRROR.12:core_1.132
-#ucode_port_133.BCM8869X=RCY_MIRROR.13:core_1.133
-#ucode_port_134.BCM8869X=RCY_MIRROR.14:core_1.134
-#ucode_port_135.BCM8869X=RCY_MIRROR.15:core_1.135
-#ucode_port_136.BCM8869X=RCY_MIRROR.16:core_1.136
-#ucode_port_137.BCM8869X=RCY_MIRROR.17:core_1.137
-#ucode_port_138.BCM8869X=RCY_MIRROR.18:core_1.138
-#ucode_port_139.BCM8869X=RCY_MIRROR.19:core_1.139
+ucode_port_100.BCM8869X=RCY_MIRROR.0:core_0.100
+ucode_port_101.BCM8869X=RCY_MIRROR.1:core_0.101
+ucode_port_102.BCM8869X=RCY_MIRROR.2:core_0.102
+ucode_port_103.BCM8869X=RCY_MIRROR.3:core_0.103
+ucode_port_104.BCM8869X=RCY_MIRROR.4:core_0.104
+ucode_port_105.BCM8869X=RCY_MIRROR.5:core_0.105
+ucode_port_106.BCM8869X=RCY_MIRROR.6:core_0.106
+ucode_port_107.BCM8869X=RCY_MIRROR.7:core_0.107
+ucode_port_108.BCM8869X=RCY_MIRROR.8:core_0.108
+ucode_port_109.BCM8869X=RCY_MIRROR.9:core_0.109
+ucode_port_110.BCM8869X=RCY_MIRROR.10:core_0.110
+ucode_port_111.BCM8869X=RCY_MIRROR.11:core_0.111
+ucode_port_112.BCM8869X=RCY_MIRROR.12:core_0.112
+ucode_port_113.BCM8869X=RCY_MIRROR.13:core_0.113
+ucode_port_114.BCM8869X=RCY_MIRROR.14:core_0.114
+ucode_port_115.BCM8869X=RCY_MIRROR.15:core_0.115
+ucode_port_116.BCM8869X=RCY_MIRROR.16:core_0.116
+ucode_port_117.BCM8869X=RCY_MIRROR.17:core_0.117
+ucode_port_118.BCM8869X=RCY_MIRROR.18:core_0.118
+ucode_port_119.BCM8869X=RCY_MIRROR.19:core_0.119
+ucode_port_120.BCM8869X=RCY_MIRROR.0:core_1.120
+ucode_port_121.BCM8869X=RCY_MIRROR.1:core_1.121
+ucode_port_122.BCM8869X=RCY_MIRROR.2:core_1.122
+ucode_port_123.BCM8869X=RCY_MIRROR.3:core_1.123
+ucode_port_124.BCM8869X=RCY_MIRROR.4:core_1.124
+ucode_port_125.BCM8869X=RCY_MIRROR.5:core_1.125
+ucode_port_126.BCM8869X=RCY_MIRROR.6:core_1.126
+ucode_port_127.BCM8869X=RCY_MIRROR.7:core_1.127
+ucode_port_128.BCM8869X=RCY_MIRROR.8:core_1.128
+ucode_port_129.BCM8869X=RCY_MIRROR.9:core_1.129
+ucode_port_130.BCM8869X=RCY_MIRROR.10:core_1.130
+ucode_port_131.BCM8869X=RCY_MIRROR.11:core_1.131
+ucode_port_132.BCM8869X=RCY_MIRROR.12:core_1.132
+ucode_port_133.BCM8869X=RCY_MIRROR.13:core_1.133
+ucode_port_134.BCM8869X=RCY_MIRROR.14:core_1.134
+ucode_port_135.BCM8869X=RCY_MIRROR.15:core_1.135
+ucode_port_136.BCM8869X=RCY_MIRROR.16:core_1.136
+ucode_port_137.BCM8869X=RCY_MIRROR.17:core_1.137
+ucode_port_138.BCM8869X=RCY_MIRROR.18:core_1.138
+ucode_port_139.BCM8869X=RCY_MIRROR.19:core_1.139
+ucode_port_140.BCM8869X=RCY_MIRROR.20:core_0.130
+ucode_port_141.BCM8869X=RCY_MIRROR.21:core_0.131
+ucode_port_142.BCM8869X=RCY_MIRROR.22:core_0.132
+ucode_port_143.BCM8869X=RCY_MIRROR.23:core_0.133
+ucode_port_144.BCM8869X=RCY_MIRROR.24:core_0.134
+ucode_port_145.BCM8869X=RCY_MIRROR.25:core_0.135
+ucode_port_146.BCM8869X=RCY_MIRROR.20:core_1.142
+ucode_port_147.BCM8869X=RCY_MIRROR.21:core_1.143
+ucode_port_148.BCM8869X=RCY_MIRROR.22:core_1.144
+ucode_port_149.BCM8869X=RCY_MIRROR.23:core_1.145
+ucode_port_150.BCM8869X=RCY_MIRROR.24:core_1.140
+ucode_port_151.BCM8869X=RCY_MIRROR.26:core_1.141
+ucode_port_152.BCM8869X=RCY_MIRROR.27:core_0.136
+ucode_port_153.BCM8869X=RCY_MIRROR.28:core_0.137
+ucode_port_154.BCM8869X=RCY_MIRROR.27:core_1.142
 
 port_priorities.BCM8869X=8