Skip to content

Commit 24a9da0

Browse files
i-davydenkoi-davydenko
authored
Merge branch 'sonic-net:master' into dev-cli-sessions
2 parents 18f246c + 518c3bc commit 24a9da0

File tree

620 files changed

+91890
-4618
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

620 files changed

+91890
-4618
lines changed

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ ifeq ($(NOBUSTER), 0)
8383
$(MAKE) -f Makefile.work bullseye
8484
endif
8585

86-
init:
86+
init reset:
8787
@echo "+++ Making $@ +++"
8888
$(MAKE) -f Makefile.work $@
8989

@@ -108,7 +108,7 @@ $(PLATFORM_PATH):
108108
configure : $(PLATFORM_PATH)
109109
$(call make_work, $@)
110110

111-
clean reset showtag docker-cleanup sonic-slave-build sonic-slave-bash :
111+
clean showtag docker-cleanup sonic-slave-build sonic-slave-bash :
112112
$(call make_work, $@)
113113

114114
# Freeze the versions, see more detail options: scripts/versions_manager.py freeze -h

‎Makefile.work

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,13 @@
5454
# * ENABLE_BOOTCHART: Enable SONiC bootchart
5555
# * Default: n
5656
# * Values: y,n
57-
# * GZ_COMPRESS_PROGRAM: Select pigz to reduce build time
58-
# * Default: gzip
59-
# * Values: pigz,gzip
6057
# * UNATTENDED: Don't wait for interactive input from terminal, setting this
6158
# * value to anything will enable it
6259
# * Default: unset
6360
# * Value: y
64-
#
61+
# * SONIC_PTF_ENV_PY_VER: Python version for PTF image
62+
# * Default: mixed
63+
# * Values: mixed,py3
6564
###############################################################################
6665

6766
SHELL = /bin/bash
@@ -155,10 +154,6 @@ ifeq ($(LEGACY_SONIC_MGMT_DOCKER),)
155154
override LEGACY_SONIC_MGMT_DOCKER = y
156155
endif
157156

158-
ifneq ($(GZ_COMPRESS_PROGRAM), pigz)
159-
override GZ_COMPRESS_PROGRAM = gzip
160-
endif
161-
162157
ifeq ($(CONFIGURED_ARCH),amd64)
163158
SLAVE_BASE_IMAGE = $(SLAVE_DIR)
164159
MULTIARCH_QEMU_ENVIRON = n
@@ -227,7 +222,6 @@ $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) \
227222
INCLUDE_FIPS=$(INCLUDE_FIPS) \
228223
DOCKER_EXTRA_OPTS=$(DOCKER_EXTRA_OPTS) \
229224
DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) \
230-
GZ_COMPRESS_PROGRAM=$(GZ_COMPRESS_PROGRAM) \
231225
j2 $(SLAVE_DIR)/Dockerfile.j2 > $(SLAVE_DIR)/Dockerfile)
232226

233227
$(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) \
@@ -585,13 +579,13 @@ SONIC_BUILD_INSTRUCTION := $(MAKE) \
585579
SONIC_SLAVE_DOCKER_DRIVER=$(SONIC_SLAVE_DOCKER_DRIVER) \
586580
MIRROR_URLS=$(MIRROR_URLS) \
587581
MIRROR_SECURITY_URLS=$(MIRROR_SECURITY_URLS) \
588-
GZ_COMPRESS_PROGRAM=$(GZ_COMPRESS_PROGRAM) \
589582
MIRROR_SNAPSHOT=$(MIRROR_SNAPSHOT) \
590583
SONIC_VERSION_CONTROL_COMPONENTS=$(SONIC_VERSION_CONTROL_COMPONENTS) \
591584
ONIE_IMAGE_PART_SIZE=$(ONIE_IMAGE_PART_SIZE) \
592585
SONIC_OS_VERSION=$(SONIC_OS_VERSION) \
593586
PIP_HTTP_TIMEOUT=$(PIP_HTTP_TIMEOUT) \
594587
LEGACY_SONIC_MGMT_DOCKER=$(LEGACY_SONIC_MGMT_DOCKER) \
588+
SONIC_PTF_ENV_PY_VER=$(SONIC_PTF_ENV_PY_VER) \
595589
$(SONIC_OVERRIDE_BUILD_VARS)
596590

597591
.PHONY: sonic-slave-build sonic-slave-bash init reset

‎README.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
*master builds*:
22

3-
[![Barefoot](https://dev.azure.com/mssonic/build/_apis/build/status/barefoot/Azure.sonic-buildimage.official.barefoot?branchName=master&label=Barefoot)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=146&branchName=master)
43
[![Broadcom](https://dev.azure.com/mssonic/build/_apis/build/status/broadcom/Azure.sonic-buildimage.official.broadcom?branchName=master&label=Broadcom)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=138&branchName=master)
54
[![Centec](https://dev.azure.com/mssonic/build/_apis/build/status/centec/Azure.sonic-buildimage.official.centec?branchName=master&label=Centec)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=143&branchName=master)
65
[![Centec(arm64)](https://dev.azure.com/mssonic/build/_apis/build/status/centec/Azure.sonic-buildimage.official.centec-arm64?branchName=master&label=Centec-arm64)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=140&branchName=master)
@@ -9,8 +8,20 @@
98
[![Marvell(armhf)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell/Azure.sonic-buildimage.official.marvell-armhf?branchName=master&label=Marvell-armhf)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=141&branchName=master)
109
[![Marvell(arm64)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell/Azure.sonic-buildimage.official.marvell-arm64?branchName=master&label=Marvell-arm64)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=999&branchName=master)
1110
[![Nephos](https://dev.azure.com/mssonic/build/_apis/build/status/nephos/Azure.sonic-buildimage.official.nephos?branchName=master&label=Nephos)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=149&branchName=master)
11+
[![Pensando](https://dev.azure.com/mssonic/build/_apis/build/status/pensando/Azure.sonic-buildimage.official.pensando?branchName=master&label=Pensando)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=1366&branchName=master)
1212
[![VS](https://dev.azure.com/mssonic/build/_apis/build/status/vs/Azure.sonic-buildimage.official.vs?branchName=master&label=VS)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=142&branchName=master)
1313

14+
*202311 builds*:
15+
16+
[![Broadcom](https://dev.azure.com/mssonic/build/_apis/build/status/broadcom/Azure.sonic-buildimage.official.broadcom?branchName=202311&label=Broadcom)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=138&branchName=202311)
17+
[![Centec](https://dev.azure.com/mssonic/build/_apis/build/status/centec/Azure.sonic-buildimage.official.centec?branchName=202311&label=Centec)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=143&branchName=202311)
18+
[![Centec(arm64)](https://dev.azure.com/mssonic/build/_apis/build/status/centec/Azure.sonic-buildimage.official.centec-arm64?branchName=202311&label=Centec-arm64)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=140&branchName=202311)
19+
[![Innovium](https://dev.azure.com/mssonic/build/_apis/build/status/innovium/Azure.sonic-buildimage.official.innovium?branchName=202311&label=Innovium)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=148&branchName=202311)
20+
[![Mellanox](https://dev.azure.com/mssonic/build/_apis/build/status/mellanox/Azure.sonic-buildimage.official.mellanox?branchName=202311&label=Mellanox)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=139&branchName=202311)
21+
[![Marvell(armhf)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell/Azure.sonic-buildimage.official.marvell-armhf?branchName=202311&label=Marvell-armhf)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=141&branchName=202311)
22+
[![Marvell(arm64)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell/Azure.sonic-buildimage.official.marvell-arm64?branchName=202311&label=Marvell-arm64)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=999&branchName=202311)
23+
[![VS](https://dev.azure.com/mssonic/build/_apis/build/status/vs/Azure.sonic-buildimage.official.vs?branchName=202311&label=VS)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=142&branchName=202311)
24+
1425
*202305 builds*:
1526

1627
[![Barefoot](https://dev.azure.com/mssonic/build/_apis/build/status/barefoot/Azure.sonic-buildimage.official.barefoot?branchName=202205&label=Barefoot)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=146&branchName=202305)

‎azure-pipelines.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,21 @@ stages:
261261
MAX_WORKER: $(T0_SONIC_INSTANCE_NUM)
262262
MGMT_BRANCH: $(BUILD_BRANCH)
263263

264+
- job: onboarding_elastictest_t0
265+
displayName: "onboarding testcases by Elastictest"
266+
timeoutInMinutes: 240
267+
continueOnError: true
268+
pool: ubuntu-20.04
269+
steps:
270+
- template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
271+
parameters:
272+
TOPOLOGY: t0
273+
MIN_WORKER: $(T0_ONBOARDING_SONIC_INSTANCE_NUM)
274+
MAX_WORKER: $(T0_ONBOARDING_SONIC_INSTANCE_NUM)
275+
KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
276+
MGMT_BRANCH: $(BUILD_BRANCH)
277+
TEST_SET: onboarding_t0
278+
264279

265280
# - job: wan_elastictest
266281
# displayName: "kvmtest-wan by Elastictest"

‎build_debian.sh

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,7 @@ else
150150
fi
151151

152152
## docker and mkinitramfs on target system will use pigz/unpigz automatically
153-
if [[ $GZ_COMPRESS_PROGRAM == pigz ]]; then
154-
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install pigz
155-
fi
153+
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install pigz
156154

157155
## Install initramfs-tools and linux kernel
158156
## Note: initramfs-tools recommends depending on busybox, and we really want busybox for
@@ -402,10 +400,13 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
402400
auditd \
403401
linux-perf \
404402
resolvconf \
405-
lsof \
406-
sysstat \
407-
xxd \
408-
zstd
403+
lsof \
404+
sysstat \
405+
xxd \
406+
wireless-regdb \
407+
ethtool \
408+
zstd \
409+
nvme-cli
409410

410411
# Have systemd create the auditd log directory
411412
sudo mkdir -p ${FILESYSTEM_ROOT}/etc/systemd/system/auditd.service.d
@@ -876,8 +877,8 @@ if [[ $MULTIARCH_QEMU_ENVIRON == y || $CROSS_BUILD_ENVIRON == y ]]; then
876877
fi
877878

878879
## Compress docker files
879-
pushd $FILESYSTEM_ROOT && sudo tar -I $GZ_COMPRESS_PROGRAM -cf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
880+
pushd $FILESYSTEM_ROOT && sudo tar -I pigz -cf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
880881

881882
## Compress together with /boot, /var/lib/docker and $PLATFORM_DIR as an installer payload zip file
882-
pushd $FILESYSTEM_ROOT && sudo tar -I $GZ_COMPRESS_PROGRAM -cf platform.tar.gz -C $PLATFORM_DIR . && sudo zip -n .gz $OLDPWD/$INSTALLER_PAYLOAD -r boot/ platform.tar.gz; popd
883+
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
883884
sudo zip -g -n .squashfs:.gz $INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS $FILESYSTEM_DOCKERFS

‎build_image.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ generate_kvm_image()
6060
exit 1
6161
}
6262

63-
$GZ_COMPRESS_PROGRAM $KVM_IMAGE_DISK
63+
pigz $KVM_IMAGE_DISK
6464

6565
[ -r $KVM_IMAGE_DISK.gz ] || {
66-
echo "Error : $GZ_COMPRESS_PROGRAM $KVM_IMAGE_DISK failed!"
66+
echo "Error : pigz $KVM_IMAGE_DISK failed!"
6767
exit 1
6868
}
6969

‎device/arista/x86_64-arista_7060px5_64s/sensors.conf

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,30 @@ chip "tmp464-i2c-19-48"
1111
label temp1 "Board sensor"
1212
label temp2 "TH4 exhaust temp sensor"
1313
label temp3 "Inlet temp sensor"
14+
ignore temp4
15+
ignore temp5
16+
ignore temp6
17+
ignore temp7
18+
ignore temp8
19+
ignore temp9
1420

1521
chip "dps800-i2c-22-58"
1622
label temp1 "Power supply 1 hotspot sensor"
1723
label temp2 "Power supply 1 inlet temp sensor"
18-
ignore temp3 "Power supply 1 exhaust temp sensor"
24+
ignore temp3
25+
26+
ignore fan2
27+
ignore fan3
28+
ignore fan4
1929

2030
chip "dps800-i2c-23-58"
2131
label temp1 "Power supply 2 hotspot sensor"
2232
label temp2 "Power supply 2 inlet temp sensor"
23-
label temp3 "Power supply 2 exhaust temp sensor"
33+
ignore temp3
34+
35+
ignore fan2
36+
ignore fan3
37+
ignore fan4
2438

2539
chip "lm73-i2c-24-48"
2640
label temp1 "Front panel temp sensor"

0 commit comments

Comments
 (0)