Skip to content

Commit

Permalink
Merge branch 'sonic-net:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
rameshraghupathy authored Oct 29, 2024
2 parents 6a66f8b + cc4a402 commit f2d10fa
Show file tree
Hide file tree
Showing 396 changed files with 64,855 additions and 978 deletions.
21 changes: 20 additions & 1 deletion .azure-pipelines/azure-pipelines-image-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,28 @@ jobs:
displayName: 'Make configure'
postSteps:
- script: |
BUILD_REASON=$(Build.Reason)
echo "Build.Reason = $BUILD_REASON"
echo "Build.DefinitionName = $BUILD_DEFINITIONNAME"
if [[ "$BUILD_REASON" != "PullRequest" && "$BUILD_DEFINITIONNAME" == "Azure.sonic-buildimage.official.vs" ]]
then
PORT=443
DOCKERS=$(ls target/docker-ptf.gz)
BRANCH=$(Build.SourceBranchName)
echo "Branch = $BRANCH"
LABELS="$BRANCH"
[[ "$BRANCH" == "master" ]] && LABELS="$LABELS latest"
for f in $DOCKERS; do
echo $f
echo "Labels = $LABELS"
./push_docker.sh $f $(REGISTRY_SERVER_PUBLIC) $PORT $(REGISTRY_USERNAME) "$REGISTRY_PASSWD" "$LABELS"
done
fi
mkdir -p $(Build.ArtifactStagingDirectory)/target
mv target/* $(Build.ArtifactStagingDirectory)/target/
displayName: Copy Artifacts
env:
REGISTRY_PASSWD: $(REGISTRY_PASSWD)
displayName: Publish to Docker Registry and Copy Artifacts
condition: always()
- publish: $(Build.ArtifactStagingDirectory)
artifact: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)'
Expand Down
1 change: 1 addition & 0 deletions .azure-pipelines/official-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ stages:
- stage: Build
pool: sonicbld-1es
variables:
- group: Container-Registry
- name: CACHE_MODE
value: wcache
- template: .azure-pipelines/azure-pipelines-repd-build-variables.yml@buildimage
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,6 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
10000 5m 1248 2288 35776 0 2288
25000 5m 1248 2288 53248 0 2288
40000 5m 1248 2288 66560 0 2288
50000 5m 1248 2288 90272 0 2288
100000 5m 18796 3556 300990 0 3556
200000 5m 18796 3556 300990 0 3556
400000 5m 18796 3556 300990 0 3556
10000 40m 1248 2288 37024 0 2288
25000 40m 1248 2288 53248 0 2288
40000 40m 1248 2288 71552 0 2288
50000 40m 1248 2288 96096 0 2288
100000 40m 18796 3556 300990 0 3556
200000 40m 18796 3556 300990 0 3556
400000 40m 18796 3556 300990 0 3556
10000 300m 1248 2288 46176 0 2288
25000 300m 1248 2288 79040 0 2288
40000 300m 1248 2288 108160 0 2288
50000 300m 1248 2288 141856 0 2288
100000 300m 18796 3556 300990 0 3556
200000 300m 18796 3556 300990 0 3556
400000 300m 18796 3556 300990 0 3556
100000 5m 18796 0 300990 0 3556
200000 5m 18796 0 300990 0 3556
100000 40m 18796 0 300990 0 3556
200000 40m 18796 0 300990 0 3556
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Ethernet340 325,326,327,328 Ethernet43/5 43 400000 rs
Ethernet344 337,338,339,340 Ethernet44/1 44 400000 rs
Ethernet348 341,342,343,344 Ethernet44/5 44 400000 rs
Ethernet352 377,378,379,380 Ethernet45/1 45 400000 rs
Ethernet356 381,382,381,382 Ethernet45/5 45 400000 rs
Ethernet356 381,382,383,384 Ethernet45/5 45 400000 rs
Ethernet360 361,362,363,364 Ethernet46/1 46 400000 rs
Ethernet364 365,366,367,368 Ethernet46/5 46 400000 rs
Ethernet368 353,354,355,356 Ethernet47/1 47 400000 rs
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
{
"interfaces": {
"Ethernet1": {
"default_brkout_mode": "1x200G"
},
"Ethernet5": {
"default_brkout_mode": "1x200G"
},
"Ethernet9": {
"default_brkout_mode": "1x200G"
},
"Ethernet13": {
"default_brkout_mode": "1x200G"
},
"Ethernet17": {
"default_brkout_mode": "1x200G"
},
"Ethernet21": {
"default_brkout_mode": "1x200G"
},
"Ethernet25": {
"default_brkout_mode": "1x200G"
},
"Ethernet29": {
"default_brkout_mode": "1x200G"
},
"Ethernet33": {
"default_brkout_mode": "1x200G"
},
"Ethernet37": {
"default_brkout_mode": "1x200G"
},
"Ethernet41": {
"default_brkout_mode": "1x200G"
},
"Ethernet45": {
"default_brkout_mode": "1x200G"
},
"Ethernet49": {
"default_brkout_mode": "1x200G"
},
"Ethernet53": {
"default_brkout_mode": "1x200G"
},
"Ethernet57": {
"default_brkout_mode": "1x200G"
},
"Ethernet61": {
"default_brkout_mode": "1x200G"
},
"Ethernet65": {
"default_brkout_mode": "1x200G"
},
"Ethernet69": {
"default_brkout_mode": "1x200G"
},
"Ethernet73": {
"default_brkout_mode": "1x200G"
},
"Ethernet77": {
"default_brkout_mode": "1x200G"
},
"Ethernet81": {
"default_brkout_mode": "1x200G"
},
"Ethernet85": {
"default_brkout_mode": "1x200G"
},
"Ethernet89": {
"default_brkout_mode": "1x200G"
},
"Ethernet93": {
"default_brkout_mode": "1x200G"
},
"Ethernet97": {
"default_brkout_mode": "1x400G"
},
"Ethernet105": {
"default_brkout_mode": "1x400G"
},
"Ethernet113": {
"default_brkout_mode": "1x400G"
},
"Ethernet121": {
"default_brkout_mode": "1x400G"
},
"Ethernet129": {
"default_brkout_mode": "1x400G"
},
"Ethernet137": {
"default_brkout_mode": "1x400G"
},
"Ethernet145": {
"default_brkout_mode": "1x400G"
},
"Ethernet153": {
"default_brkout_mode": "1x400G"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# name lanes alias index speed
Ethernet1 25,26,27,28 twoHundredGigE0/1 0 200000
Ethernet5 29,30,31,32 twoHundredGigE0/2 1 200000
Ethernet9 41,42,43,44 twoHundredGigE0/3 2 200000
Ethernet13 45,46,47,48 twoHundredGigE0/4 3 200000
Ethernet17 49,50,51,52 twoHundredGigE0/5 4 200000
Ethernet21 53,54,55,56 twoHundredGigE0/6 5 200000
Ethernet25 57,58,59,60 twoHundredGigE0/7 6 200000
Ethernet29 61,62,63,64 twoHundredGigE0/8 7 200000
Ethernet33 9,10,11,12 twoHundredGigE0/9 8 200000
Ethernet37 13,14,15,16 twoHundredGigE0/10 9 200000
Ethernet41 17,18,19,20 twoHundredGigE0/11 10 200000
Ethernet45 21,22,23,24 twoHundredGigE0/12 11 200000
Ethernet49 81,82,83,84 twoHundredGigE0/13 12 200000
Ethernet53 85,86,87,88 twoHundredGigE0/14 13 200000
Ethernet57 89,90,91,92 twoHundredGigE0/15 14 200000
Ethernet61 93,94,95,96 twoHundredGigE0/16 15 200000
Ethernet65 97,98,99,100 twoHundredGigE0/17 16 200000
Ethernet69 101,102,103,104 twoHundredGigE0/18 17 200000
Ethernet73 137,138,139,140 twoHundredGigE0/19 18 200000
Ethernet77 141,142,143,144 twoHundredGigE0/20 19 200000
Ethernet81 145,146,147,148 twoHundredGigE0/21 20 200000
Ethernet85 149,150,151,152 twoHundredGigE0/22 21 200000
Ethernet89 153,154,155,156 twoHundredGigE0/23 22 200000
Ethernet93 157,158,159,160 twoHundredGigE0/24 23 200000
Ethernet97 1,2,3,4,5,6,7,8 fourHundredGigE0/1 24 400000
Ethernet105 33,34,35,36,37,38,39,40 fourHundredGigE0/2 25 400000
Ethernet113 65,66,67,68,69,70,71,72 fourHundredGigE0/3 26 400000
Ethernet121 73,74,75,76,77,78,79,80 fourHundredGigE0/4 27 400000
Ethernet129 105,106,107,108,109,110,111,112 fourHundredGigE0/5 28 400000
Ethernet137 113,114,115,116,117,118,119,120 fourHundredGigE0/6 29 400000
Ethernet145 121,122,123,124,125,126,127,128 fourHundredGigE0/7 30 400000
Ethernet153 129,130,131,132,133,134,135,136 fourHundredGigE0/8 31 400000
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td4-m2-w6520-24dc8qc-24x200G+8x400G.yml
Loading

0 comments on commit f2d10fa

Please sign in to comment.