Skip to content

Commit

Permalink
Merge branch '202205' into 202205
Browse files Browse the repository at this point in the history
  • Loading branch information
anamehra authored Dec 19, 2023
2 parents bbe3522 + 4c32ba1 commit ca78c08
Show file tree
Hide file tree
Showing 316 changed files with 72,795 additions and 1,706 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
make $BUILD_OPTIONS target/docker-sonic-vs.gz target/sonic-vs.img.gz target/docker-ptf.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
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@
[submodule "src/scapy"]
path = src/scapy
url = https://github.com/secdev/scapy.git
[submodule "platform/mellanox/mlnx-sai/SAI-Implementation"]
path = platform/mellanox/mlnx-sai/SAI-Implementation
url = https://github.com/Mellanox/SAI-Implementation
[submodule "src/sonic-mgmt-framework"]
path = src/sonic-mgmt-framework
url = https://github.com/sonic-net/sonic-mgmt-framework
Expand Down
15 changes: 12 additions & 3 deletions build_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT mount
[ -d $TRUSTED_GPG_DIR ] && [ ! -z "$(ls $TRUSTED_GPG_DIR)" ] && sudo cp $TRUSTED_GPG_DIR/* ${FILESYSTEM_ROOT}/etc/apt/trusted.gpg.d/

## Pointing apt to public apt mirrors and getting latest packages, needed for latest security updates
scripts/build_mirror_config.sh files/apt $CONFIGURED_ARCH $IMAGE_DISTRO
scripts/build_mirror_config.sh files/apt $CONFIGURED_ARCH $IMAGE_DISTRO
sudo cp files/apt/sources.list.$CONFIGURED_ARCH $FILESYSTEM_ROOT/etc/apt/sources.list
sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-languages},no-check-valid-until} $FILESYSTEM_ROOT/etc/apt/apt.conf.d/

Expand Down Expand Up @@ -281,7 +281,7 @@ then
## Install Kubernetes master
echo '[INFO] Install kubernetes master'
install_kubernetes ${MASTER_KUBERNETES_VERSION}

sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -fsSL \
https://packages.microsoft.com/keys/microsoft.asc | \
sudo LANG=C chroot $FILESYSTEM_ROOT apt-key add -
Expand All @@ -296,7 +296,7 @@ then
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove gnupg
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/cri-dockerd.deb -fsSL \
https://github.com/Mirantis/cri-dockerd/releases/download/v${MASTER_CRI_DOCKERD}/cri-dockerd_${MASTER_CRI_DOCKERD}.3-0.debian-${IMAGE_DISTRO}_amd64.deb
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install -f /tmp/cri-dockerd.deb
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install -f /tmp/cri-dockerd.deb
sudo LANG=C chroot $FILESYSTEM_ROOT rm -f /tmp/cri-dockerd.deb
else
echo '[INFO] Skipping Install kubernetes master'
Expand Down Expand Up @@ -431,6 +431,15 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
systemd-sysv \
ntp

# Workaround for issue: The udev rule may fail to be executed because the
# daemon-reload command is executed in parallel
# Github issue: https://github.com/systemd/systemd/issues/24668
# Github PR: https://github.com/systemd/systemd/pull/24673
# This workaround should be removed after a upstream already contains the fixes
sudo patch $FILESYSTEM_ROOT/lib/systemd/system/systemd-udevd.service \
files/image_config/systemd/systemd-udevd/fix-udev-rule-may-fail-if-daemon-reload-command-runs.patch


if [[ $CONFIGURED_ARCH == amd64 ]]; then
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y download \
grub-pc-bin
Expand Down
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800_sup/chassisdb.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ chassis_db_address=127.100.1.1
midplane_subnet=127.100.0.0/16

lag_id_start=1
lag_id_end=128
lag_id_end=1024
Original file line number Diff line number Diff line change
Expand Up @@ -861,3 +861,4 @@ dma_desc_aggregator_enable_specific_MDB_LPM.BCM8869X=1
dma_desc_aggregator_enable_specific_MDB_FEC.BCM8869X=1
sai_pfc_dlr_init_capability=0
sai_disable_srcmacqedstmac_ctrl=1
sai_default_cpu_tx_tc=7
Original file line number Diff line number Diff line change
Expand Up @@ -1016,3 +1016,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2
sai_pfc_dlr_init_capability=0

sai_disable_srcmacqedstmac_ctrl=1
sai_default_cpu_tx_tc=7
Original file line number Diff line number Diff line change
Expand Up @@ -1016,3 +1016,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2
sai_pfc_dlr_init_capability=0

sai_disable_srcmacqedstmac_ctrl=1
sai_default_cpu_tx_tc=7
Original file line number Diff line number Diff line change
Expand Up @@ -1032,3 +1032,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
sai_pfc_dlr_init_capability=0
sai_disable_srcmacqedstmac_ctrl=1
sai_default_cpu_tx_tc=7
Original file line number Diff line number Diff line change
Expand Up @@ -1032,3 +1032,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
sai_pfc_dlr_init_capability=0
sai_disable_srcmacqedstmac_ctrl=1
sai_default_cpu_tx_tc=7
Original file line number Diff line number Diff line change
Expand Up @@ -1053,3 +1053,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
sai_pfc_dlr_init_capability=0

sai_disable_srcmacqedstmac_ctrl=1
sai_default_cpu_tx_tc=7
Original file line number Diff line number Diff line change
Expand Up @@ -1053,3 +1053,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
sai_pfc_dlr_init_capability=0

sai_disable_srcmacqedstmac_ctrl=1
sai_default_cpu_tx_tc=7
2 changes: 1 addition & 1 deletion device/celestica/x86_64-cel_e1031-r0/installer.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CONSOLE_PORT=0x2f8
CONSOLE_DEV=1
CONSOLE_SPEED=9600
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich processor.max_cstate=1 intel_idle.max_cstate=0"
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich processor.max_cstate=1 intel_idle.max_cstate=0 i2c-i801.disable_features=0x10"
2 changes: 1 addition & 1 deletion device/celestica/x86_64-cel_seastone-r0/installer.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CONSOLE_PORT=0x3f8
CONSOLE_DEV=0
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich"
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich i2c-i801.disable_features=0x10"
2 changes: 1 addition & 1 deletion device/dell/x86_64-dell_s6100_c2538-r0/installer.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CONSOLE_PORT=0x2f8
CONSOLE_DEV=1
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich,wdat_wdt acpi_no_watchdog=1 nos-config-part=/dev/sda12 logs_inram=on"
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich,wdat_wdt acpi_no_watchdog=1 nos-config-part=/dev/sda12 i2c-i801.disable_features=0x10"
8 changes: 7 additions & 1 deletion device/dell/x86_64-dell_s6100_c2538-r0/platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,13 @@
},
{
"name": "QSFP+ or later"
}
},
{
"name": "SFP/SFP+/SFP28"
},
{
"name": "SFP/SFP+/SFP28"
}
]
},
"interfaces": {}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"DEVICE_METADATA": {
"localhost": {
"create_only_config_db_buffers": "true"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"DEVICE_METADATA": {
"localhost": {
"create_only_config_db_buffers": "true"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"DEVICE_METADATA": {
"localhost": {
"create_only_config_db_buffers": "true"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"DEVICE_METADATA": {
"localhost": {
"create_only_config_db_buffers": "true"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_8x50g_28x100g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_8x100g_40x50g_8x10g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_44x50g_10x100g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_48x50g_8x100g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
2 changes: 1 addition & 1 deletion device/mellanox/x86_64-mlnx_msn2700-r0/installer.conf
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq logs_inram=on"
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq"
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"DEVICE_METADATA": {
"localhost": {
"create_only_config_db_buffers": "true"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"DEVICE_METADATA": {
"localhost": {
"create_only_config_db_buffers": "true"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3420.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"DEVICE_METADATA": {
"localhost": {
"create_only_config_db_buffers": "true"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3700.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"DEVICE_METADATA": {
"localhost": {
"create_only_config_db_buffers": "true"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3700c.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"DEVICE_METADATA": {
"localhost": {
"create_only_config_db_buffers": "true"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_2x10g_100x50g_12x100g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_112x50g_8x100g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_24x50g_52x100g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_1x10g_28x50g_49x100g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_28x50g_52x100g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"DEVICE_METADATA": {
"localhost": {
"create_only_config_db_buffers": "true"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4410.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"DEVICE_METADATA": {
"localhost": {
"create_only_config_db_buffers": "true"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"DEVICE_METADATA": {
"localhost": {
"create_only_config_db_buffers": "true"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600C.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600C.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600c_100x50g_12x100g_2x10g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600c_112x50g_8x100g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600c_48x50g_40x100g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg
Loading

0 comments on commit ca78c08

Please sign in to comment.