Skip to content

Commit

Permalink
Merge branch 'sonic-net:master' into Fix_sm_mnt
Browse files Browse the repository at this point in the history
  • Loading branch information
@gpunathilell
gpunathilell authored Feb 27, 2025
2 parents f067078 + 7f1f300 commit 8c45a4b
Show file tree
Hide file tree
Showing 600 changed files with 62,522 additions and 12,628 deletions.
8 changes: 7 additions & 1 deletion .azure-pipelines/docker-sonic-mgmt-py3-only.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,15 @@ stages:
- template: cleanup.yml
- checkout: self
clean: true

- script: |
set -x
sudo setfacl -R -b $(Agent.BuildDirectory)
displayName: 'setfacl'
- bash: |
set -xe
git submodule update --init --recursive -- src/sonic-platform-daemons src/sonic-genl-packet src/sonic-sairedis src/ptf src/sonic-device-data
git submodule update --init --recursive -- src/sonic-platform-daemons src/sonic-genl-packet src/sonic-sairedis src/ptf src/sonic-device-data src/sonic-dash-api
make SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y configure PLATFORM=generic
make -f Makefile.work BLDENV=bullseye SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y LEGACY_SONIC_MGMT_DOCKER=n target/docker-sonic-mgmt.gz
Expand Down
7 changes: 6 additions & 1 deletion .azure-pipelines/docker-sonic-mgmt.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,14 @@ stages:
- template: cleanup.yml
- checkout: self
clean: true
- script: |
set -x
sudo setfacl -R -b $(Agent.BuildDirectory)
displayName: 'setfacl'
- bash: |
set -xe
git submodule update --init --recursive -- src/sonic-platform-daemons src/sonic-genl-packet src/sonic-sairedis src/ptf src/sonic-device-data
git submodule update --init --recursive -- src/sonic-platform-daemons src/sonic-genl-packet src/sonic-sairedis src/ptf src/sonic-device-data src/sonic-dash-api
make SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y configure PLATFORM=generic
make -f Makefile.work BLDENV=bullseye SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y LEGACY_SONIC_MGMT_DOCKER=y target/docker-sonic-mgmt.gz
Expand Down
20 changes: 17 additions & 3 deletions build_debian.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/linux-image-${LINUX_KERNEL_VERSI
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install acl
if [[ $CONFIGURED_ARCH == amd64 ]]; then
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install dmidecode hdparm
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install hdparm
fi

## Update initramfs for booting with squashfs+overlay
Expand Down Expand Up @@ -379,6 +379,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
haveged \
fdisk \
gpg \
dmidecode \
jq \
auditd \
linux-perf \
Expand All @@ -391,6 +392,12 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
zstd \
nvme-cli

sudo cp files/initramfs-tools/pzstd $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/pzstd
sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/pzstd

sudo cp files/initramfs-tools/file $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/file
sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/file

# Have systemd create the auditd log directory
sudo mkdir -p ${FILESYSTEM_ROOT}/etc/systemd/system/auditd.service.d
sudo tee ${FILESYSTEM_ROOT}/etc/systemd/system/auditd.service.d/log-directory.conf >/dev/null <<EOF
Expand Down Expand Up @@ -747,7 +754,10 @@ if [[ $TARGET_BOOTLOADER == uboot ]]; then
elif [[ $CONFIGURED_ARCH == arm64 ]]; then
if [[ $CONFIGURED_PLATFORM == pensando ]]; then
## copy device tree file into boot (XXX: need to compile dtb from dts)
sudo cp -v $PLATFORM_DIR/pensando/elba-asic-psci.dtb $FILESYSTEM_ROOT/boot/
sudo cp -v $FILESYSTEM_ROOT/usr/lib/linux-image-${LINUX_KERNEL_VERSION}-${CONFIGURED_ARCH}/pensando/elba-asic-psci.dtb $FILESYSTEM_ROOT/boot/
sudo cp -v $FILESYSTEM_ROOT/usr/lib/linux-image-${LINUX_KERNEL_VERSION}-${CONFIGURED_ARCH}/pensando/elba-asic-psci-lipari.dtb $FILESYSTEM_ROOT/boot/
sudo cp -v $FILESYSTEM_ROOT/usr/lib/linux-image-${LINUX_KERNEL_VERSION}-${CONFIGURED_ARCH}/pensando/elba-asic-psci-mtfuji.dtb $FILESYSTEM_ROOT/boot/
sudo cp -v $PLATFORM_DIR/pensando/install_file $FILESYSTEM_ROOT/boot/
## make kernel as gzip file
sudo LANG=C chroot $FILESYSTEM_ROOT gzip /boot/${KERNEL_FILE}
sudo LANG=C chroot $FILESYSTEM_ROOT mv /boot/${KERNEL_FILE}.gz /boot/${KERNEL_FILE}
Expand Down Expand Up @@ -851,7 +861,11 @@ if [[ $MULTIARCH_QEMU_ENVIRON == y || $CROSS_BUILD_ENVIRON == y ]]; then
fi

## Compress docker files
pushd $FILESYSTEM_ROOT && sudo tar -I pigz -cf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
if [ "$BUILD_REDUCE_IMAGE_SIZE" = "y" ]; then
pushd $FILESYSTEM_ROOT && sudo tar -I pzstd -cf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
else
pushd $FILESYSTEM_ROOT && sudo tar -I pigz -cf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
fi

## Compress together with /boot, /var/lib/docker and $PLATFORM_DIR as an installer payload zip file
pushd $FILESYSTEM_ROOT && sudo tar -I pigz -cf platform.tar.gz -C $PLATFORM_DIR . && sudo zip -n .gz $OLDPWD/$INSTALLER_PAYLOAD -r boot/ platform.tar.gz; popd
Expand Down
10 changes: 5 additions & 5 deletions device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
# speed cable size xon xoff threshold xon_offset
40000 300m 0 2560 69632 -6 181753
100000 300m 0 2560 110592 -6 363506
400000 300m 0 2560 315392 -6 1454025
400000 300m 0 2560 315392 -5 1454025
40000 1000m 0 2560 114688 -6 181753
100000 1000m 0 2560 225280 -6 363506
400000 1000m 0 2560 778240 -6 1454025
400000 1000m 0 2560 778240 -5 1454025
40000 2000m 0 2560 184320 -6 181753
100000 2000m 0 2560 393216 -6 363506
400000 2000m 0 2560 1445888 -6 1454025
400000 2000m 0 2560 1445888 -5 1454025
40000 80000m 0 2560 5369856 -6 181753
100000 80000m 0 2560 13357056 -6 363506
400000 80000m 0 2560 53305344 -6 1454025
400000 80000m 0 2560 53305344 -5 1454025
40000 120000m 0 2560 8028160 -6 181753
100000 120000m 0 2560 20004864 -6 363506
400000 120000m 0 2560 79900672 -6 1454025
400000 120000m 0 2560 79900672 -5 1454025
10 changes: 5 additions & 5 deletions device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
# speed cable size xon xoff threshold xon_offset
40000 300m 0 2560 69632 -6 181753
100000 300m 0 2560 110592 -6 363506
400000 300m 0 2560 315392 -6 1454025
400000 300m 0 2560 315392 -5 1454025
40000 1000m 0 2560 114688 -6 181753
100000 1000m 0 2560 225280 -6 363506
400000 1000m 0 2560 778240 -6 1454025
400000 1000m 0 2560 778240 -5 1454025
40000 2000m 0 2560 184320 -6 181753
100000 2000m 0 2560 393216 -6 363506
400000 2000m 0 2560 1445888 -6 1454025
400000 2000m 0 2560 1445888 -5 1454025
40000 80000m 0 2560 5369856 -6 181753
100000 80000m 0 2560 13357056 -6 363506
400000 80000m 0 2560 53305344 -6 1454025
400000 80000m 0 2560 53305344 -5 1454025
40000 120000m 0 2560 8028160 -6 181753
100000 120000m 0 2560 20004864 -6 363506
400000 120000m 0 2560 79900672 -6 1454025
400000 120000m 0 2560 79900672 -5 1454025
10 changes: 5 additions & 5 deletions device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
# speed cable size xon xoff threshold xon_offset
40000 300m 0 2560 69632 -6 181753
100000 300m 0 2560 110592 -6 363506
400000 300m 0 2560 315392 -6 1454025
400000 300m 0 2560 315392 -5 1454025
40000 1000m 0 2560 114688 -6 181753
100000 1000m 0 2560 225280 -6 363506
400000 1000m 0 2560 778240 -6 1454025
400000 1000m 0 2560 778240 -5 1454025
40000 2000m 0 2560 184320 -6 181753
100000 2000m 0 2560 393216 -6 363506
400000 2000m 0 2560 1445888 -6 1454025
400000 2000m 0 2560 1445888 -5 1454025
40000 80000m 0 2560 5369856 -6 181753
100000 80000m 0 2560 13357056 -6 363506
400000 80000m 0 2560 53305344 -6 1454025
400000 80000m 0 2560 53305344 -5 1454025
40000 120000m 0 2560 8028160 -6 181753
100000 120000m 0 2560 20004864 -6 363506
400000 120000m 0 2560 79900672 -6 1454025
400000 120000m 0 2560 79900672 -5 1454025
10 changes: 5 additions & 5 deletions device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
# speed cable size xon xoff threshold xon_offset
40000 300m 0 2560 69632 -6 181753
100000 300m 0 2560 110592 -6 363506
400000 300m 0 2560 315392 -6 1454025
400000 300m 0 2560 315392 -5 1454025
40000 1000m 0 2560 114688 -6 181753
100000 1000m 0 2560 225280 -6 363506
400000 1000m 0 2560 778240 -6 1454025
400000 1000m 0 2560 778240 -5 1454025
40000 2000m 0 2560 184320 -6 181753
100000 2000m 0 2560 393216 -6 363506
400000 2000m 0 2560 1445888 -6 1454025
400000 2000m 0 2560 1445888 -5 1454025
40000 80000m 0 2560 5369856 -6 181753
100000 80000m 0 2560 13357056 -6 363506
400000 80000m 0 2560 53305344 -6 1454025
400000 80000m 0 2560 53305344 -5 1454025
40000 120000m 0 2560 8028160 -6 181753
100000 120000m 0 2560 20004864 -6 363506
400000 120000m 0 2560 79900672 -6 1454025
400000 120000m 0 2560 79900672 -5 1454025
10 changes: 5 additions & 5 deletions device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
# speed cable size xon xoff threshold xon_offset
40000 300m 0 2560 69632 -6 181753
100000 300m 0 2560 110592 -6 363506
400000 300m 0 2560 315392 -6 1454025
400000 300m 0 2560 315392 -5 1454025
40000 1000m 0 2560 114688 -6 181753
100000 1000m 0 2560 225280 -6 363506
400000 1000m 0 2560 778240 -6 1454025
400000 1000m 0 2560 778240 -5 1454025
40000 2000m 0 2560 184320 -6 181753
100000 2000m 0 2560 393216 -6 363506
400000 2000m 0 2560 1445888 -6 1454025
400000 2000m 0 2560 1445888 -5 1454025
40000 80000m 0 2560 5369856 -6 181753
100000 80000m 0 2560 13357056 -6 363506
400000 80000m 0 2560 53305344 -6 1454025
400000 80000m 0 2560 53305344 -5 1454025
40000 120000m 0 2560 8028160 -6 181753
100000 120000m 0 2560 20004864 -6 363506
400000 120000m 0 2560 79900672 -6 1454025
400000 120000m 0 2560 79900672 -5 1454025
10 changes: 5 additions & 5 deletions device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
# speed cable size xon xoff threshold xon_offset
40000 300m 0 2560 69632 -6 181753
100000 300m 0 2560 110592 -6 363506
400000 300m 0 2560 315392 -6 1454025
400000 300m 0 2560 315392 -5 1454025
40000 1000m 0 2560 114688 -6 181753
100000 1000m 0 2560 225280 -6 363506
400000 1000m 0 2560 778240 -6 1454025
400000 1000m 0 2560 778240 -5 1454025
40000 2000m 0 2560 184320 -6 181753
100000 2000m 0 2560 393216 -6 363506
400000 2000m 0 2560 1445888 -6 1454025
400000 2000m 0 2560 1445888 -5 1454025
40000 80000m 0 2560 5369856 -6 181753
100000 80000m 0 2560 13357056 -6 363506
400000 80000m 0 2560 53305344 -6 1454025
400000 80000m 0 2560 53305344 -5 1454025
40000 120000m 0 2560 8028160 -6 181753
100000 120000m 0 2560 20004864 -6 363506
400000 120000m 0 2560 79900672 -6 1454025
400000 120000m 0 2560 79900672 -5 1454025
20 changes: 10 additions & 10 deletions device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
40000 300m 0 2560 69632 -5 181753
100000 300m 0 2560 110592 -5 363506
40000 300m 0 2560 69632 -6 181753
100000 300m 0 2560 110592 -6 363506
400000 300m 0 2560 315392 -5 1454025
40000 1000m 0 2560 114688 -5 181753
100000 1000m 0 2560 225280 -5 363506
40000 1000m 0 2560 114688 -6 181753
100000 1000m 0 2560 225280 -6 363506
400000 1000m 0 2560 778240 -5 1454025
40000 2000m 0 2560 184320 -5 181753
100000 2000m 0 2560 393216 -5 363506
40000 2000m 0 2560 184320 -6 181753
100000 2000m 0 2560 393216 -6 363506
400000 2000m 0 2560 1445888 -5 1454025
40000 80000m 0 2560 5369856 -5 181753
100000 80000m 0 2560 13357056 -5 363506
40000 80000m 0 2560 5369856 -6 181753
100000 80000m 0 2560 13357056 -6 363506
400000 80000m 0 2560 53305344 -5 1454025
40000 120000m 0 2560 8028160 -5 181753
100000 120000m 0 2560 20004864 -5 363506
40000 120000m 0 2560 8028160 -6 181753
100000 120000m 0 2560 20004864 -6 363506
400000 120000m 0 2560 79900672 -5 1454025
20 changes: 10 additions & 10 deletions device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
40000 300m 0 2560 69632 -5 181753
100000 300m 0 2560 110592 -5 363506
40000 300m 0 2560 69632 -6 181753
100000 300m 0 2560 110592 -6 363506
400000 300m 0 2560 315392 -5 1454025
40000 1000m 0 2560 114688 -5 181753
100000 1000m 0 2560 225280 -5 363506
40000 1000m 0 2560 114688 -6 181753
100000 1000m 0 2560 225280 -6 363506
400000 1000m 0 2560 778240 -5 1454025
40000 2000m 0 2560 184320 -5 181753
100000 2000m 0 2560 393216 -5 363506
40000 2000m 0 2560 184320 -6 181753
100000 2000m 0 2560 393216 -6 363506
400000 2000m 0 2560 1445888 -5 1454025
40000 80000m 0 2560 5369856 -5 181753
100000 80000m 0 2560 13357056 -5 363506
40000 80000m 0 2560 5369856 -6 181753
100000 80000m 0 2560 13357056 -6 363506
400000 80000m 0 2560 53305344 -5 1454025
40000 120000m 0 2560 8028160 -5 181753
100000 120000m 0 2560 20004864 -5 363506
40000 120000m 0 2560 8028160 -6 181753
100000 120000m 0 2560 20004864 -6 363506
400000 120000m 0 2560 79900672 -5 1454025
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800r3a_36d_lc/pmon_daemon_control.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../x86_64-arista_common/pmon_daemon_control.json
../x86_64-arista_common/pmon_daemon_control_linecard.json
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800r3a_36d_lc/system_health_monitoring_config.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../x86_64-arista_common/system_health_monitoring_config.json
../x86_64-arista_common/system_health_monitoring_config_linecard.json
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800r3a_36d_lc/thermal_policy.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../x86_64-arista_common/thermal_policy.json
../x86_64-arista_common/thermal_policy_linecard.json
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800r3a_36dm2_lc/pmon_daemon_control.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../x86_64-arista_common/pmon_daemon_control.json
../x86_64-arista_common/pmon_daemon_control_linecard.json
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800r3a_36dm2_lc/system_health_monitoring_config.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../x86_64-arista_common/system_health_monitoring_config.json
../x86_64-arista_common/system_health_monitoring_config_linecard.json
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800r3a_36dm2_lc/thermal_policy.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../x86_64-arista_common/thermal_policy.json
../x86_64-arista_common/thermal_policy_linecard.json
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800r3a_36p_lc/pmon_daemon_control.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../x86_64-arista_common/pmon_daemon_control.json
../x86_64-arista_common/pmon_daemon_control_linecard.json
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800r3a_36p_lc/system_health_monitoring_config.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../x86_64-arista_common/system_health_monitoring_config.json
../x86_64-arista_common/system_health_monitoring_config_linecard.json
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800r3a_36p_lc/thermal_policy.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../x86_64-arista_common/thermal_policy.json
../x86_64-arista_common/thermal_policy_linecard.json
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800r3ak_36d2_lc/pmon_daemon_control.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../x86_64-arista_common/pmon_daemon_control.json
../x86_64-arista_common/pmon_daemon_control_linecard.json
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800r3ak_36d2_lc/system_health_monitoring_config.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../x86_64-arista_common/system_health_monitoring_config.json
../x86_64-arista_common/system_health_monitoring_config_linecard.json
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800r3ak_36d2_lc/thermal_policy.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../x86_64-arista_common/thermal_policy.json
../x86_64-arista_common/thermal_policy_linecard.json
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800r3ak_36dm2_lc/pmon_daemon_control.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../x86_64-arista_common/pmon_daemon_control.json
../x86_64-arista_common/pmon_daemon_control_linecard.json
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800r3ak_36dm2_lc/system_health_monitoring_config.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../x86_64-arista_common/system_health_monitoring_config.json
../x86_64-arista_common/system_health_monitoring_config_linecard.json
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7800r3ak_36dm2_lc/thermal_policy.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../x86_64-arista_common/thermal_policy.json
../x86_64-arista_common/thermal_policy_linecard.json
36 changes: 0 additions & 36 deletions device/marvell/arm64-marvell_db98cx8580_16cd-r0/FALCON16X25G/buffers_defaults_t1.j2
View file

This file was deleted.

Loading

0 comments on commit 8c45a4b

Please sign in to comment.