Merge branch 'master' of https://github.com/rajib-dutta1/sonic-buildi…

…mage into ipmitool_bookworm
sonic-net · Feb 13, 2024 · 584423e · 584423e
2 parents 89104d5 + bd47fd1
commit 584423e
Show file tree

Hide file tree

Showing 207 changed files with 1,888 additions and 1,145 deletions.
diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
@@ -33,13 +33,14 @@ parameters:
   type: object
   default:
   - vs
-  - barefoot
   - broadcom
   - centec
   - centec-arm64
   - generic
   - marvell-armhf
+  - marvell-arm64
   - mellanox
+  - pensando
 
 stages:
 - stage: Prepare

diff --git a/.azure-pipelines/azure-pipelines-build-ubuntu-2004.yml b/.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
@@ -29,7 +39,8 @@ stages:
                          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 \
-                         libboost-all-dev libgtest-dev build-essential
+                         libboost-all-dev libgtest-dev build-essential swig4.0 swig
+        sudo pip3 install pytest click
         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

diff --git a/Makefile.work b/Makefile.work
@@ -556,6 +556,7 @@ 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) \

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -43,6 +43,11 @@ variables:
   value: rcache
 - name: ENABLE_FIPS
   value: n
+- name: BUILD_BRANCH
+  ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+    value: $(System.PullRequest.TargetBranch)
+  ${{ else }}:
+    value: $(Build.SourceBranchName)
 
 stages:
 - stage: BuildVS
@@ -166,7 +171,7 @@ stages:
         TOPOLOGY: t0
         MIN_WORKER: $(T0_INSTANCE_NUM)
         MAX_WORKER: $(T0_INSTANCE_NUM)
-        MGMT_BRANCH: "master"
+        MGMT_BRANCH: $(BUILD_BRANCH)
 
   - job: t0_2vlans_elastictest
     pool: ubuntu-20.04
@@ -180,7 +185,7 @@ stages:
         TEST_SET: t0-2vlans
         MIN_WORKER: $(T0_2VLANS_INSTANCE_NUM)
         MAX_WORKER: $(T0_2VLANS_INSTANCE_NUM)
-        MGMT_BRANCH: "master"
+        MGMT_BRANCH: $(BUILD_BRANCH)
         DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a"
 
   - job: t1_lag_elastictest
@@ -194,7 +199,7 @@ stages:
         TOPOLOGY: t1-lag
         MIN_WORKER: $(T1_LAG_INSTANCE_NUM)
         MAX_WORKER: $(T1_LAG_INSTANCE_NUM)
-        MGMT_BRANCH: "master"
+        MGMT_BRANCH: $(BUILD_BRANCH)
 
   - job: multi_asic_elastictest
     displayName: "kvmtest-multi-asic-t1-lag by Elastictest"
@@ -209,7 +214,7 @@ stages:
           MIN_WORKER: $(MULTI_ASIC_INSTANCE_NUM)
           MAX_WORKER: $(MULTI_ASIC_INSTANCE_NUM)
           NUM_ASIC: 4
-          MGMT_BRANCH: "master"
+          MGMT_BRANCH: $(BUILD_BRANCH)
 
   - job: dualtor_elastictest
     pool: ubuntu-20.04
@@ -222,7 +227,7 @@ stages:
           TOPOLOGY: dualtor
           MIN_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
           MAX_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
-          MGMT_BRANCH: "master"
+          MGMT_BRANCH: $(BUILD_BRANCH)
           COMMON_EXTRA_PARAMS: "--disable_loganalyzer "
 
   - job: sonic_t0_elastictest
@@ -237,7 +242,7 @@ stages:
           MIN_WORKER: $(T0_SONIC_INSTANCE_NUM)
           MAX_WORKER: $(T0_SONIC_INSTANCE_NUM)
           TEST_SET: t0-sonic
-          MGMT_BRANCH: "master"
+          MGMT_BRANCH: $(BUILD_BRANCH)
           COMMON_EXTRA_PARAMS: "--neighbor_type=sonic "
           VM_TYPE: vsonic
 
@@ -252,8 +257,7 @@ stages:
           TOPOLOGY: dpu
           MIN_WORKER: $(T0_SONIC_INSTANCE_NUM)
           MAX_WORKER: $(T0_SONIC_INSTANCE_NUM)
-          KVM_IMAGE_BRANCH: "master"
-          MGMT_BRANCH: "master"
+          MGMT_BRANCH: $(BUILD_BRANCH)
 
 
 #  - job: wan_elastictest

diff --git a/build_debian.sh b/build_debian.sh
@@ -484,10 +484,14 @@ rm /files/etc/ssh/sshd_config/ClientAliveInterval
 rm /files/etc/ssh/sshd_config/ClientAliveCountMax
 touch /files/etc/ssh/sshd_config/EmptyLineHack
 rename /files/etc/ssh/sshd_config/EmptyLineHack ""
-set /files/etc/ssh/sshd_config/ClientAliveInterval 900
+set /files/etc/ssh/sshd_config/ClientAliveInterval 300
 set /files/etc/ssh/sshd_config/ClientAliveCountMax 0
 ins #comment before /files/etc/ssh/sshd_config/ClientAliveInterval
-set /files/etc/ssh/sshd_config/#comment[following-sibling::*[1][self::ClientAliveInterval]] "Close inactive client sessions after 15 minutes"
+set /files/etc/ssh/sshd_config/#comment[following-sibling::*[1][self::ClientAliveInterval]] "Close inactive client sessions after 5 minutes"
+rm /files/etc/ssh/sshd_config/MaxAuthTries
+set /files/etc/ssh/sshd_config/MaxAuthTries 3
+rm /files/etc/ssh/sshd_config/Banner
+set /files/etc/ssh/sshd_config/Banner /etc/issue
 rm /files/etc/ssh/sshd_config/LogLevel
 set /files/etc/ssh/sshd_config/LogLevel VERBOSE
 save

diff --git a/device/mellanox/x86_64-mlnx_msn2010-r0/installer.conf b/device/mellanox/x86_64-mlnx_msn2010-r0/installer.conf
@@ -1 +1 @@
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq libata.force=noncq"
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/installer.conf b/device/mellanox/x86_64-mlnx_msn2700-r0/installer.conf
@@ -1 +1 @@
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq libata.force=noncq"
diff --git a/device/mellanox/x86_64-mlnx_msn2700a1-r0/installer.conf b/device/mellanox/x86_64-mlnx_msn2700a1-r0/installer.conf
@@ -0,0 +1 @@
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="libata.force=noncq"
diff --git a/device/mellanox/x86_64-mlnx_msn3420-r0/installer.conf b/device/mellanox/x86_64-mlnx_msn3420-r0/installer.conf
@@ -0,0 +1 @@
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="libata.force=noncq"
diff --git a/device/mellanox/x86_64-mlnx_msn3700-r0/installer.conf b/device/mellanox/x86_64-mlnx_msn3700-r0/installer.conf
@@ -0,0 +1 @@
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="libata.force=noncq"
diff --git a/device/mellanox/x86_64-mlnx_msn3700c-r0/installer.conf b/device/mellanox/x86_64-mlnx_msn3700c-r0/installer.conf
@@ -0,0 +1 @@
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="libata.force=noncq"
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/installer.conf b/device/mellanox/x86_64-mlnx_msn3800-r0/installer.conf
@@ -0,0 +1 @@
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="libata.force=noncq"
diff --git a/device/mellanox/x86_64-mlnx_msn4410-r0/installer.conf b/device/mellanox/x86_64-mlnx_msn4410-r0/installer.conf
@@ -0,0 +1 @@
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="libata.force=noncq"
diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/installer.conf b/device/mellanox/x86_64-mlnx_msn4600-r0/installer.conf
@@ -0,0 +1 @@
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="libata.force=noncq"
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/installer.conf b/device/mellanox/x86_64-mlnx_msn4600c-r0/installer.conf
@@ -0,0 +1 @@
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="libata.force=noncq"
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/installer.conf b/device/mellanox/x86_64-mlnx_msn4700-r0/installer.conf
@@ -0,0 +1 @@
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="libata.force=noncq"
diff --git a/device/mellanox/x86_64-nvidia_sn2201-r0/installer.conf b/device/mellanox/x86_64-nvidia_sn2201-r0/installer.conf
@@ -1 +1 @@
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax libata.force=noncq"
diff --git a/device/mellanox/x86_64-nvidia_sn4800-r0/installer.conf b/device/mellanox/x86_64-nvidia_sn4800-r0/installer.conf
@@ -0,0 +1 @@
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="libata.force=noncq"
diff --git a/device/mellanox/x86_64-nvidia_sn5600-r0/installer.conf b/device/mellanox/x86_64-nvidia_sn5600-r0/installer.conf
@@ -0,0 +1 @@
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="libata.force=noncq"
diff --git a/...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm b/...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm
@@ -2094,3 +2094,4 @@ cmic_dma_abort_in_cold_boot=0
 sai_pfc_dlr_init_capability=0
 trunk_group_max_members=16
 sai_default_cpu_tx_tc=7
+sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/sai_postinit_cmd.soc b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/sai_postinit_cmd.soc
@@ -1 +1,29 @@
+INTeRrupt ENAble id=2209
+INTeRrupt ENAble id=2210
+INTeRrupt ENAble id=2211
+INTeRrupt ENAble id=2212
+INTeRrupt ENAble id=2213
+INTeRrupt ENAble id=2214
+INTeRrupt ENAble id=2215
+INTeRrupt ENAble id=2216
+INTeRrupt ENAble id=2217
+INTeRrupt ENAble id=2218
+INTeRrupt ENAble id=2219
+INTeRrupt ENAble id=2220
+INTeRrupt ENAble id=2221
+INTeRrupt ENAble id=2222
+INTeRrupt ENAble id=2223
+INTeRrupt ENAble id=2224
+INTeRrupt ENAble id=2225
+INTeRrupt ENAble id=2226
 
+INTeRrupt ENAble id=482
+INTeRrupt ENAble id=483
+INTeRrupt ENAble id=484
+INTeRrupt ENAble id=485
+INTeRrupt ENAble id=486
+INTeRrupt ENAble id=487
+INTeRrupt ENAble id=488
+
+INTeRrupt ENAble id=1597
+debug intr error
diff --git a/...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm b/...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm
@@ -2095,3 +2095,4 @@ cmic_dma_abort_in_cold_boot=0
 sai_pfc_dlr_init_capability=0
 trunk_group_max_members=16
 sai_default_cpu_tx_tc=7
+sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/sai_postinit_cmd.soc b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/sai_postinit_cmd.soc
@@ -1 +1,29 @@
+INTeRrupt ENAble id=2209
+INTeRrupt ENAble id=2210
+INTeRrupt ENAble id=2211
+INTeRrupt ENAble id=2212
+INTeRrupt ENAble id=2213
+INTeRrupt ENAble id=2214
+INTeRrupt ENAble id=2215
+INTeRrupt ENAble id=2216
+INTeRrupt ENAble id=2217
+INTeRrupt ENAble id=2218
+INTeRrupt ENAble id=2219
+INTeRrupt ENAble id=2220
+INTeRrupt ENAble id=2221
+INTeRrupt ENAble id=2222
+INTeRrupt ENAble id=2223
+INTeRrupt ENAble id=2224
+INTeRrupt ENAble id=2225
+INTeRrupt ENAble id=2226
 
+INTeRrupt ENAble id=482
+INTeRrupt ENAble id=483
+INTeRrupt ENAble id=484
+INTeRrupt ENAble id=485
+INTeRrupt ENAble id=486
+INTeRrupt ENAble id=487
+INTeRrupt ENAble id=488
+
+INTeRrupt ENAble id=1597
+debug intr error
diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/sai_postinit_cmd.soc b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/sai_postinit_cmd.soc
@@ -36,3 +36,32 @@ phy set 17 reg=0xd137 data=0      lane=2
 phy set 17 reg=0xd138 data=0      lane=2
 phy set 17 reg=0xd133 data=0x1804 lane=2
 
+INTeRrupt ENAble id=2209
+INTeRrupt ENAble id=2210
+INTeRrupt ENAble id=2211
+INTeRrupt ENAble id=2212
+INTeRrupt ENAble id=2213
+INTeRrupt ENAble id=2214
+INTeRrupt ENAble id=2215
+INTeRrupt ENAble id=2216
+INTeRrupt ENAble id=2217
+INTeRrupt ENAble id=2218
+INTeRrupt ENAble id=2219
+INTeRrupt ENAble id=2220
+INTeRrupt ENAble id=2221
+INTeRrupt ENAble id=2222
+INTeRrupt ENAble id=2223
+INTeRrupt ENAble id=2224
+INTeRrupt ENAble id=2225
+INTeRrupt ENAble id=2226
+
+INTeRrupt ENAble id=482
+INTeRrupt ENAble id=483
+INTeRrupt ENAble id=484
+INTeRrupt ENAble id=485
+INTeRrupt ENAble id=486
+INTeRrupt ENAble id=487
+INTeRrupt ENAble id=488
+
+INTeRrupt ENAble id=1597
+debug intr error
diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/sai_postinit_cmd.soc b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/sai_postinit_cmd.soc
@@ -13,3 +13,32 @@ phy set 8 reg=0xd137 data=0      lane=1
 phy set 8 reg=0xd138 data=0      lane=1
 phy set 8 reg=0xd133 data=0x1802 lane=1
 
+INTeRrupt ENAble id=2209
+INTeRrupt ENAble id=2210
+INTeRrupt ENAble id=2211
+INTeRrupt ENAble id=2212
+INTeRrupt ENAble id=2213
+INTeRrupt ENAble id=2214
+INTeRrupt ENAble id=2215
+INTeRrupt ENAble id=2216
+INTeRrupt ENAble id=2217
+INTeRrupt ENAble id=2218
+INTeRrupt ENAble id=2219
+INTeRrupt ENAble id=2220
+INTeRrupt ENAble id=2221
+INTeRrupt ENAble id=2222
+INTeRrupt ENAble id=2223
+INTeRrupt ENAble id=2224
+INTeRrupt ENAble id=2225
+INTeRrupt ENAble id=2226
+
+INTeRrupt ENAble id=482
+INTeRrupt ENAble id=483
+INTeRrupt ENAble id=484
+INTeRrupt ENAble id=485
+INTeRrupt ENAble id=486
+INTeRrupt ENAble id=487
+INTeRrupt ENAble id=488
+
+INTeRrupt ENAble id=1597
+debug intr error
diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform_ndk.json b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform_ndk.json
@@ -50,11 +50,11 @@
     },
     {
       "key": "thermal_log_current_threshold",
-      "intval": 2
+      "intval": 5
     },
     {
       "key": "thermal_log_margin_threshold",
-      "intval": 2
+      "intval": 5
     },
     {
       "key": "thermal_log_min_threshold",

diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/platform_ndk.json b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/platform_ndk.json
@@ -38,11 +38,11 @@
     },
     {
       "key": "thermal_log_current_threshold",
-      "intval": 3
+      "intval": 5
     },
     {
       "key": "thermal_log_margin_threshold",
-      "intval": 3
+      "intval": 5
     },
     {
       "key": "thermal_log_min_threshold",

diff --git a/dockers/docker-database/Dockerfile.j2 b/dockers/docker-database/Dockerfile.j2
@@ -12,6 +12,9 @@ RUN apt-get update
 # Install redis-server
 RUN apt-get install -y redis-tools redis-server
 
+# Install click for CLI
+RUN pip3 install click
+
 {% if docker_database_debs.strip() -%}
 # Copy locally-built Debian package dependencies
 {{ copy_files("debs/", docker_database_debs.split(' '), "/debs/") }}

diff --git a/dockers/docker-dhcp-relay/Dockerfile.j2 b/dockers/docker-dhcp-relay/Dockerfile.j2
@@ -51,13 +51,17 @@ COPY ["dhcp-relay.programs.j2", "dhcpv4-relay.agents.j2", "dhcpv6-relay.agents.j
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
 COPY ["critical_processes", "/etc/supervisor"]
 COPY ["cli", "/cli/"]
+
+{% if include_system_eventd == "y" %}
+{% if build_reduce_image_size != "y" or sonic_asic_platform != "broadcom" %}
 # Copy regex json and rsyslog_plugin.conf file into rsyslog.d
 COPY ["*.json", "/etc/rsyslog.d/"]
 COPY ["files/rsyslog_plugin.conf.j2", "/etc/rsyslog.d/"]
-
 # Create dhcp_relay_regex.conf
 RUN j2 -f json /etc/rsyslog.d/rsyslog_plugin.conf.j2 /etc/rsyslog.d/events_info.json  > /etc/rsyslog.d/dhcp_relay_events.conf
 RUN rm -f /etc/rsyslog.d/rsyslog_plugin.conf.j2
 RUN rm -f /etc/rsyslog.d/events_info.json
+{% endif %}
+{% endif %}
 
 ENTRYPOINT ["/usr/bin/docker_init.sh"]