Skip to content

Commit fcfff8d

Browse files
liuh-80liuh-80
committed
Merge remote-tracking branch 'origin' into dev/liuh/gnmi_multiple_role
2 parents b570d80 + d8f4529 commit fcfff8d

File tree

734 files changed

+48444
-4173
lines changed

Some content is hidden

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

734 files changed

+48444
-4173
lines changed

‎.azure-pipelines/azure-pipelines-UpgrateVersion.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ parameters:
3737
- centec
3838
- centec-arm64
3939
- generic
40-
- marvell-armhf
41-
- marvell-arm64
40+
- marvell-prestera-armhf
41+
- marvell-prestera-arm64
4242
- mellanox
4343
- pensando
4444
- nvidia-bluefield

‎.azure-pipelines/azure-pipelines-build.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -94,23 +94,23 @@ jobs:
9494
variables:
9595
dbg_image: yes
9696

97-
- name: marvell-armhf
97+
- name: marvell-prestera-armhf
9898
${{ if not(parameters.qemuOrCrossBuild) }}:
9999
pool: sonicbld-armhf
100100
timeoutInMinutes: 2880
101101
variables:
102-
PLATFORM_NAME: marvell
102+
PLATFORM_NAME: marvell-prestera
103103
PLATFORM_ARCH: armhf
104104

105-
- name: marvell-arm64
105+
- name: marvell-prestera-arm64
106106
${{ if not(parameters.qemuOrCrossBuild) }}:
107107
pool: sonicbld-arm64
108108
timeoutInMinutes: 2880
109109
variables:
110-
PLATFORM_NAME: marvell
110+
PLATFORM_NAME: marvell-prestera
111111
PLATFORM_ARCH: arm64
112112

113-
- name: marvell
113+
- name: marvell-prestera
114114

115115
- name: mellanox
116116
variables:

‎.azure-pipelines/azure-pipelines-image-template.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- script: |
3737
[ -n "$OVERRIDE_BUILD_OPTIONS" ] && OVERRIDE_BUILD_OPTIONS=$(OVERRIDE_BUILD_OPTIONS)
3838
BUILD_OPTIONS="$(BUILD_OPTIONS) $OVERRIDE_BUILD_OPTIONS"
39-
if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-armhf|marvell-arm64|vpp)$"; then
39+
if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-prestera-armhf|marvell-prestera-arm64|vpp)$"; then
4040
CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=$(CACHE_MODE) SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/$(PLATFORM_AZP)"
4141
BUILD_OPTIONS="$BUILD_OPTIONS $CACHE_OPTIONS"
4242
fi

‎.azure-pipelines/build-template.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ parameters:
44
values:
55
- broadcom
66
- centec-arm64
7-
- marvell-armhf
7+
- marvell-prestera-armhf
88
- mellanox
99
- vs
1010

@@ -21,7 +21,7 @@ parameters:
2121
values:
2222
- brcm
2323
- centec-arm64
24-
- marvell-armhf
24+
- marvell-prestera-armhf
2525
- mlnx
2626
- vs
2727

‎.azure-pipelines/docker-sonic-mgmt-py3-only.yml

+45-7
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ pr:
2020
include:
2121
- dockers/docker-sonic-mgmt
2222

23+
resources:
24+
repositories:
25+
- repository: sonic-mgmt
26+
type: github
27+
name: sonic-net/sonic-mgmt
28+
ref: master
29+
endpoint: sonic-net
30+
2331
parameters:
2432
- name: registry_url
2533
type: string
@@ -56,14 +64,44 @@ stages:
5664
env:
5765
REGISTRY_SERVER: ${{ parameters.registry_url }}
5866
displayName: Build docker-sonic-mgmt.gz
59-
- task: Docker@2
60-
displayName: Upload image
61-
inputs:
62-
containerRegistry: ${{ parameters.registry_conn }}
63-
repository: docker-sonic-mgmt
64-
command: push
65-
tags: py3only
67+
6668
- publish: $(Build.ArtifactStagingDirectory)
6769
artifact: 'docker-sonic-mgmt'
6870
displayName: "Archive docker image sonic-mgmt"
6971

72+
- job: validate_docker_image_and_upload
73+
pool: sonicbld-1es
74+
timeoutInMinutes: 360
75+
dependsOn: Build
76+
steps:
77+
- checkout: sonic-mgmt
78+
clean: true
79+
fetchDepth: 0
80+
displayName: 'Checkout sonic-mgmt'
81+
82+
- download: current
83+
artifact: 'docker-sonic-mgmt'
84+
displayName: "Download docker image sonic-mgmt"
85+
86+
- script: |
87+
set -ex
88+
89+
docker load -i $(Pipeline.Workspace)/docker-sonic-mgmt/target/docker-sonic-mgmt.gz
90+
91+
cd ansible
92+
sudo ./setup-management-network.sh -d
93+
cd ../
94+
docker rm -f sonic-mgmt
95+
96+
./setup-container.sh -n sonic-mgmt -d /data -i docker-sonic-mgmt -v
97+
docker exec sonic-mgmt bash -c "echo 'Container is running' && ps aux"
98+
displayName: 'Setup sonic-mgmt docker container'
99+
100+
- task: Docker@2
101+
displayName: Upload image
102+
condition: succeeded()
103+
inputs:
104+
containerRegistry: ${{ parameters.registry_conn }}
105+
repository: docker-sonic-mgmt
106+
command: push
107+
tags: py3only

‎.azure-pipelines/docker-sonic-mgmt.yml

+43-5
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ pr:
2020
include:
2121
- dockers/docker-sonic-mgmt
2222

23+
resources:
24+
repositories:
25+
- repository: sonic-mgmt
26+
type: github
27+
name: sonic-net/sonic-mgmt
28+
ref: master
29+
endpoint: sonic-net
30+
2331
parameters:
2432
- name: registry_url
2533
type: string
@@ -46,7 +54,6 @@ stages:
4654
- bash: |
4755
set -xe
4856
git submodule update --init --recursive -- src/sonic-platform-daemons src/sonic-genl-packet src/sonic-sairedis src/ptf src/sonic-device-data src/sonic-dash-api
49-
5057
make SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y configure PLATFORM=generic
5158
make -f Makefile.work BLDENV=bullseye SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y LEGACY_SONIC_MGMT_DOCKER=y target/docker-sonic-mgmt.gz
5259
cp target -r $(Build.ArtifactStagingDirectory)/target
@@ -55,14 +62,45 @@ stages:
5562
env:
5663
REGISTRY_SERVER: ${{ parameters.registry_url }}
5764
displayName: Build docker-sonic-mgmt.gz
65+
66+
- publish: $(Build.ArtifactStagingDirectory)
67+
artifact: 'docker-sonic-mgmt'
68+
displayName: "Archive docker image sonic-mgmt"
69+
70+
- job: validate_docker_image_and_upload
71+
pool: sonicbld-1es
72+
timeoutInMinutes: 360
73+
dependsOn: Build
74+
steps:
75+
- checkout: sonic-mgmt
76+
clean: true
77+
fetchDepth: 0
78+
displayName: 'Checkout sonic-mgmt'
79+
80+
- download: current
81+
artifact: 'docker-sonic-mgmt'
82+
displayName: "Download docker image sonic-mgmt"
83+
84+
- script: |
85+
set -ex
86+
87+
docker load -i $(Pipeline.Workspace)/docker-sonic-mgmt/target/docker-sonic-mgmt.gz
88+
89+
cd ansible
90+
sudo ./setup-management-network.sh -d
91+
cd ../
92+
docker rm -f sonic-mgmt
93+
94+
./setup-container.sh -n sonic-mgmt -d /data -i docker-sonic-mgmt -v
95+
96+
docker exec sonic-mgmt bash -c "echo 'Container is running' && ps aux"
97+
displayName: 'Setup sonic-mgmt docker container and verify'
98+
5899
- task: Docker@2
59100
displayName: Upload image
101+
condition: succeeded()
60102
inputs:
61103
containerRegistry: ${{ parameters.registry_conn }}
62104
repository: docker-sonic-mgmt
63105
command: push
64106
tags: latest
65-
- publish: $(Build.ArtifactStagingDirectory)
66-
artifact: 'docker-sonic-mgmt'
67-
displayName: "Archive docker image sonic-mgmt"
68-

‎.azure-pipelines/official-build-cache.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ stages:
4545
variables:
4646
docker_syncd_rpc_image: yes
4747
platform_rpc: mlnx
48-
- name: marvell-armhf
48+
- name: marvell-prestera-armhf
4949
pool: sonicbld-armhf
5050
timeoutInMinutes: 1200
5151
variables:
52-
PLATFORM_NAME: marvell
52+
PLATFORM_NAME: marvell-prestera
5353
PLATFORM_ARCH: armhf

‎.github/ISSUE_TEMPLATE/01-bug.yml

+102
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
name: Report a bug
2+
description: File a bug report
3+
title: "Bug:"
4+
labels: ['Bug :bug:']
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Thanks for taking the time to fill out this report!
10+
11+
If you are reporting a new issue, make sure that we do not have any duplicates already open. You can ensure this by searching the issue list for this repository. If there is a duplicate, please close your issue and add a comment to the existing issue instead.
12+
13+
If you suspect your issue is a bug, please edit your issue description to include the BUG REPORT INFORMATION shown below. If you fail to provide this information within 7 days, we cannot debug your issue and will close it. We will however, reopen it if you later provide the information.
14+
15+
For more information about reporting issues, see [SONiC Issue Reporting Page](https://github.com/sonic-net/SONiC/wiki#report-issues)
16+
17+
- type: markdown
18+
id: tc-bug-contact-links
19+
attributes:
20+
value: |
21+
Please ask and answer questions here at the [SONiC Support Forums](https://groups.google.com/forum/#!forum/sonicproject)
22+
23+
- type: dropdown
24+
id: tc-bug-platform
25+
attributes:
26+
label: Is it platform specific
27+
description: Platform name
28+
options:
29+
- generic
30+
- barefoot
31+
- broadcom
32+
- cavium
33+
- centec
34+
- innovium
35+
- marvell
36+
- mellanox
37+
- nephos
38+
default: 0
39+
validations:
40+
required: true
41+
42+
- type: dropdown
43+
id: tc-bug-severity
44+
attributes:
45+
label: Importance or Severity
46+
options:
47+
- Critical
48+
- High
49+
- Medium
50+
- Low
51+
validations:
52+
required: true
53+
54+
- type: textarea
55+
id: tc-bug-description
56+
attributes:
57+
label: Description of the bug
58+
description: Description of the bug
59+
placeholder: Description of the bug
60+
validations:
61+
required: true
62+
63+
- type: textarea
64+
id: tc-bug-steps-to-reproduce
65+
attributes:
66+
label: Steps to Reproduce
67+
description: Steps to Reproduce
68+
validations:
69+
required: true
70+
71+
- type: textarea
72+
id: tc-bug-actual-behavior-expected-behavior
73+
attributes:
74+
label: Actual Behavior and Expected Behavior
75+
description: Actual Behavior and Expected Behavior
76+
validations:
77+
required: true
78+
79+
- type: textarea
80+
id: tc-bug-logs
81+
attributes:
82+
label: Relevant log output
83+
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
84+
render: shell
85+
86+
- type: textarea
87+
id: tc-bug-output
88+
attributes:
89+
label: Output of `show version`, `show techsupport`
90+
description: Please copy and paste output of `show version`, `show techsupport`. This will be automatically formatted into code, so no need for backticks
91+
render: shell
92+
93+
- type: markdown
94+
id: tc-bug-attach-logs
95+
attributes:
96+
value: |
97+
Attach debug file (if any) from: `sudo generate_dump` or other logs.
98+
99+
- type: textarea
100+
id: tc-bug-attachments
101+
attributes:
102+
label: Attach files (if any)

‎.github/ISSUE_TEMPLATE/02-enhancement.yml

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: Enhancement Request
2+
description: Enhancement Request
3+
title: "Enhancement:"
4+
labels: ['Enhancement :heavy_plus_sign:']
5+
body:
6+
- type: markdown
7+
id: tc-en-contact-links
8+
attributes:
9+
value: |
10+
If you have questions about a product feature please ask and answer questions here at the [SONiC Support Forums](https://groups.google.com/forum/#!forum/sonicproject)
11+
12+
- type: dropdown
13+
id: tc-en-platform
14+
attributes:
15+
label: Is it platform specific
16+
description: Platform name
17+
options:
18+
- generic
19+
- barefoot
20+
- broadcom
21+
- cavium
22+
- centec
23+
- innovium
24+
- marvell
25+
- mellanox
26+
- nephos
27+
default: 0
28+
validations:
29+
required: true
30+
31+
- type: dropdown
32+
id: tc-en-severity
33+
attributes:
34+
label: Importance or Severity
35+
options:
36+
- Critical
37+
- High
38+
- Medium
39+
- Low
40+
validations:
41+
required: true
42+
43+
- type: textarea
44+
id: tc-en-description
45+
attributes:
46+
label: Description of the enhancement
47+
description: Description of the enhancement
48+
placeholder: Description of the enhancement
49+
validations:
50+
required: true
51+
52+
- type: textarea
53+
id: tc-en-cb
54+
attributes:
55+
label: Current Behavior
56+
description: Current Behavior
57+
validations:
58+
required: true
59+
60+
- type: textarea
61+
id: tc-en-pb
62+
attributes:
63+
label: Proposed Behavior
64+
description: Proposed Behavior
65+
validations:
66+
required: true

0 commit comments

Comments
 (0)