Skip to content

Commit

Permalink
Merge branch 'master' into patch1_branch
Browse files Browse the repository at this point in the history
  • Loading branch information
rkavitha-hcl authored Oct 3, 2024
2 parents a71fb49 + 7ca784a commit 424eaca
Show file tree
Hide file tree
Showing 977 changed files with 229,048 additions and 22,683 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/

4 changes: 4 additions & 0 deletions .azure-pipelines/azure-pipelines-image-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ jobs:
fetchDepth: 0
condition: and(succeeded(), eq(variables.SKIP_CHECKOUT, ''))
displayName: 'Checkout code'
- script: |
set -x
sudo setfacl -R -b $(Agent.BuildDirectory)
displayName: 'setfacl'
- script: |
BRANCH_NAME=$(Build.SourceBranchName)
[ -n "$SYSTEM_PULLREQUEST_PULLREQUESTID" ] && BRANCH_NAME="$SYSTEM_PULLREQUEST_TARGETBRANCH-$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER"
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
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
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 424eaca

Please sign in to comment.