Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into syslog_telemetry_…
Browse files Browse the repository at this point in the history
…shared
  • Loading branch information
renukamanavalan committed Jul 20, 2022
2 parents 33eba65 + e4e3adc commit 30b9ea1
Show file tree
Hide file tree
Showing 85 changed files with 15,423 additions and 101 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-repd-build-variables.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variables:
${{ if eq(variables['Build.Reason'],'PullRequest') }}:
VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=$([ "$(System.PullRequest.TargetBranch)" != "master" ] && echo deb,py2,py3,web,git,docker)'
${{ elseif ne(variables['Build.SourceBranch'],'master') }}:
${{ elseif ne(variables['Build.SourceBranchName'],'master') }}:
VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
${{ else }}:
VERSION_CONTROL_OPTIONS: ''
1 change: 1 addition & 0 deletions .azure-pipelines/vstest-exclude
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
^platform
^.azure-pipelines
^files/build/versions
^sonic-slave-
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ stages:
jobs:
- template: .azure-pipelines/azure-pipelines-build.yml
parameters:
buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) ${{ variables.VERSION_CONTROL_OPTIONS }}'
buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) BUILD_MULTIASIC_KVM=y ${{ variables.VERSION_CONTROL_OPTIONS }}'
jobGroups:
- name: vs

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
{
"CONTEXTS": [
{
"guid" : 0,
"name" : "asic0",
"dbAsic" : "ASIC_DB",
"dbCounters" : "COUNTERS_DB",
"dbFlex": "FLEX_COUNTER_DB",
"dbState" : "STATE_DB",
"zmq_enable" : false,
"zmq_endpoint": "tcp://127.0.0.1:5555",
"zmq_ntf_endpoint": "tcp://127.0.0.1:5556",
"switches": [
{
"index" : 0,
"hwinfo" : ""
}
]
},
{
"guid" : 1,
"name" : "phys",
"dbAsic" : "GB_ASIC_DB",
"dbCounters" : "GB_COUNTERS_DB",
"dbFlex": "GB_FLEX_COUNTER_DB",
"dbState" : "STATE_DB",
"zmq_enable" : false,
"zmq_endpoint": "tcp://127.0.0.1:5565",
"zmq_ntf_endpoint": "tcp://127.0.0.1:5566",
"switches": [
{
"index" : 0,
"hwinfo" : "0"
},
{
"index" : 1,
"hwinfo" : "1"
},
{
"index" : 2,
"hwinfo" : "2"
},
{
"index" : 3,
"hwinfo" : "3"
},
{
"index" : 4,
"hwinfo" : "4"
},
{
"index" : 5,
"hwinfo" : "5"
},
{
"index" : 6,
"hwinfo" : "6"
},
{
"index" : 7,
"hwinfo" : "7"
},
{
"index" : 8,
"hwinfo" : "9"
},
{
"index" : 9,
"hwinfo" : "10"
},
{
"index" : 10,
"hwinfo" : "11"
},
{
"index" : 11,
"hwinfo" : "12"
},
{
"index" : 12,
"hwinfo" : "13"
},
{
"index" : 13,
"hwinfo" : "14"
},
{
"index" : 14,
"hwinfo" : "15"
},
{
"index" : 15,
"hwinfo" : "16"
},
{
"index" : 16,
"hwinfo" : "18"
},
{
"index" : 17,
"hwinfo" : "19"
},
{
"index" : 18,
"hwinfo" : "20"
},
{
"index" : 19,
"hwinfo" : "21"
},
{
"index" : 20,
"hwinfo" : "22"
},
{
"index" : 21,
"hwinfo" : "23"
},
{
"index" : 22,
"hwinfo" : "24"
},
{
"index" : 23,
"hwinfo" : "25"
}
]
}
]
}
Loading

0 comments on commit 30b9ea1

Please sign in to comment.