Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into otn_pre_202411
Browse files Browse the repository at this point in the history
  • Loading branch information
sonic-otn committed Sep 14, 2024
2 parents 9cdba10 + 87282ed commit b07b1d5
Show file tree
Hide file tree
Showing 1,326 changed files with 261,809 additions and 14,088 deletions.
10 changes: 10 additions & 0 deletions .azure-pipelines/azure-pipelines-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -186,3 +186,13 @@ jobs:
fi
displayName: "Build sonic image"
- template: .azure-pipelines/check-dirty-version.yml@buildimage
- task: ManifestGeneratorTask@0
condition: ne(variables.SKIP_MG, 'y')
timeoutInMinutes: 60
continueOnError: true
displayName: "Manifest Generator"
inputs:
BuildDropPath: '$(System.DefaultWorkingDirectory)/target/'
ManifestDirPath: 'target/'
BuildComponentPath: $(System.DefaultWorkingDirectory)/src/

5 changes: 5 additions & 0 deletions Makefile.work
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,11 @@ SHELL = /bin/bash
USER := $(shell id -un)
PWD := $(shell pwd)
USER_LC := $(shell echo $(USER) | tr A-Z a-z)
ifneq ($(DEFAULT_CONTAINER_REGISTRY),)
DOCKER_MACHINE := $(shell docker run --rm $(DEFAULT_CONTAINER_REGISTRY)/debian:buster uname -m)
else
DOCKER_MACHINE := $(shell docker run --rm debian:buster uname -m)
endif
HOST_DOCKERD_GID := $(shell getent group docker | cut -d : -f3)

comma := ,
Expand Down Expand Up @@ -563,6 +567,7 @@ SONIC_BUILD_INSTRUCTION := $(MAKE) \
ONIE_IMAGE_PART_SIZE=$(ONIE_IMAGE_PART_SIZE) \
SONIC_OS_VERSION=$(SONIC_OS_VERSION) \
PIP_HTTP_TIMEOUT=$(PIP_HTTP_TIMEOUT) \
BUILD_PROCESS_TIMEOUT=$(BUILD_PROCESS_TIMEOUT) \
LEGACY_SONIC_MGMT_DOCKER=$(LEGACY_SONIC_MGMT_DOCKER) \
SONIC_PTF_ENV_PY_VER=$(SONIC_PTF_ENV_PY_VER) \
$(SONIC_OVERRIDE_BUILD_VARS)
Expand Down
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,20 @@

[![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)

*202405 builds*:

[![Broadcom](https://dev.azure.com/mssonic/build/_apis/build/status/broadcom/Azure.sonic-buildimage.official.broadcom?branchName=202405&label=Broadcom)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=138&branchName=202405)
[![Centec](https://dev.azure.com/mssonic/build/_apis/build/status/centec/Azure.sonic-buildimage.official.centec?branchName=202405&label=Centec)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=143&branchName=202405)
[![Centec(arm64)](https://dev.azure.com/mssonic/build/_apis/build/status/centec/Azure.sonic-buildimage.official.centec-arm64?branchName=202405&label=Centec-arm64)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=140&branchName=202405)
[![Innovium](https://dev.azure.com/mssonic/build/_apis/build/status/innovium/Azure.sonic-buildimage.official.innovium?branchName=202405&label=Innovium)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=148&branchName=202405)
[![Mellanox](https://dev.azure.com/mssonic/build/_apis/build/status/mellanox/Azure.sonic-buildimage.official.mellanox?branchName=202405&label=Mellanox)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=139&branchName=202405)
[![Marvell(armhf)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell/Azure.sonic-buildimage.official.marvell-armhf?branchName=202405&label=Marvell-armhf)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=141&branchName=202405)
[![Marvell(arm64)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell/Azure.sonic-buildimage.official.marvell-arm64?branchName=202405&label=Marvell-arm64)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=999&branchName=202405)
[![Nephos](https://dev.azure.com/mssonic/build/_apis/build/status/nephos/Azure.sonic-buildimage.official.nephos?branchName=202405&label=Nephos)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=149&branchName=202405)
[![Nvidia-Bluefield](https://dev.azure.com/mssonic/build/_apis/build/status/nvidia/Azure.sonic-buildimage.official.nvidia-bluefield?branchName=202405&label=Nvidia-Bluefield)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=1665&branchName=202405)
[![Pensando](https://dev.azure.com/mssonic/build/_apis/build/status/pensando/Azure.sonic-buildimage.official.pensando?branchName=202405&label=Pensando)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=1366&branchName=202405)
[![VS](https://dev.azure.com/mssonic/build/_apis/build/status/vs/Azure.sonic-buildimage.official.vs?branchName=202405&label=VS)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=142&branchName=202405)

*202311 builds*:

[![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)
Expand Down
37 changes: 36 additions & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -262,20 +262,55 @@ stages:
MGMT_BRANCH: $(BUILD_BRANCH)

- job: onboarding_elastictest_t0
displayName: "onboarding testcases by Elastictest"
displayName: "onboarding t0 testcases by Elastictest - optional"
timeoutInMinutes: 240
continueOnError: true
pool: sonic-ubuntu-1c
steps:
- template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
parameters:
TOPOLOGY: t0
STOP_ON_FAILURE: "False"
RETRY_TIMES: 0
MIN_WORKER: $(T0_ONBOARDING_SONIC_INSTANCE_NUM)
MAX_WORKER: $(T0_ONBOARDING_SONIC_INSTANCE_NUM)
KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
MGMT_BRANCH: $(BUILD_BRANCH)
TEST_SET: onboarding_t0

- job: onboarding_elastictest_t1
displayName: "onboarding t1 testcases by Elastictest - optional"
timeoutInMinutes: 240
continueOnError: true
pool: sonic-ubuntu-1c
steps:
- template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
parameters:
TOPOLOGY: t1-lag
STOP_ON_FAILURE: "False"
RETRY_TIMES: 0
MIN_WORKER: $(T1_LAG_ONBOARDING_INSTANCE_NUM)
MAX_WORKER: $(T1_LAG_ONBOARDING_INSTANCE_NUM)
KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
MGMT_BRANCH: $(BUILD_BRANCH)
TEST_SET: onboarding_t1

- job: onboarding_elastictest_dualtor
displayName: "onboarding dualtor testcases by Elastictest - optional"
timeoutInMinutes: 240
continueOnError: true
pool: sonic-ubuntu-1c
steps:
- template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
parameters:
TOPOLOGY: dualtor
STOP_ON_FAILURE: "False"
RETRY_TIMES: 0
MIN_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
MAX_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
MGMT_BRANCH: $(BUILD_BRANCH)
TEST_SET: onboarding_dualtor

# - job: wan_elastictest
# displayName: "kvmtest-wan by Elastictest"
Expand Down
2 changes: 1 addition & 1 deletion build_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)
## docker engine version (with platform)
DOCKER_VERSION=5:24.0.2-1~debian.12~$IMAGE_DISTRO
CONTAINERD_IO_VERSION=1.6.21-1
LINUX_KERNEL_VERSION=6.1.0-11-2
LINUX_KERNEL_VERSION=6.1.0-22-2

## Working directory to prepare the file system
FILESYSTEM_ROOT=./fsroot
Expand Down
11 changes: 11 additions & 0 deletions build_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,17 @@ elif [ "$IMAGE_TYPE" = "dsc" ]; then

generate_onie_installer_image

elif [ "$IMAGE_TYPE" = "bfb" ]; then
echo "Build BFB installer"

if [[ $SECURE_UPGRADE_MODE != "no_sign" ]]; then
secure_upgrade_keys="--signing-key "$SECURE_UPGRADE_DEV_SIGNING_KEY" --signing-cert "$SECURE_UPGRADE_SIGNING_CERT""
fi

sudo -E ./platform/${CONFIGURED_PLATFORM}/installer/create_sonic_image --kernel $KVERSION "$secure_upgrade_keys"

sudo chown $USER $OUTPUT_BFB_IMAGE

else
echo "Error: Non supported image type $IMAGE_TYPE"
exit 1
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
{
"interfaces": {
"Ethernet0": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet8": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet16": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet24": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet32": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet40": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet48": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet56": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet64": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet72": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet80": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet88": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet96": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet104": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet112": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet120": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet128": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet136": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet144": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet152": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet160": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet168": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet176": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet184": {
"default_brkout_mode": "2x100G[50G,40G,25G,10G]"
},
"Ethernet192": {
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
},
"Ethernet200": {
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
},
"Ethernet208": {
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
},
"Ethernet216": {
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
},
"Ethernet224": {
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
},
"Ethernet232": {
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
},
"Ethernet240": {
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
},
"Ethernet248": {
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
},
"Ethernet256": {
"default_brkout_mode": "1x10G",
"fec": "none"
}
}
}
Loading

0 comments on commit b07b1d5

Please sign in to comment.