Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rebase to sonic 202012 1e8c79a3 to fix compile error #12

Merged
merged 25 commits into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
7b41de1
[submodule] Update submodule sonic-telemetry to the latest HEAD autom…
mssonicbld Nov 29, 2023
2aa3298
[minigraph-parser] Disable unsupported counters on management devices…
lizhijianrd Dec 4, 2023
2984017
Update sonic-snmpagent submdoule (#17393)
liuh-80 Dec 5, 2023
1d08623
add timeout to ping6 command (#17729)
theasianpianist Jan 10, 2024
a278f10
[build] Use public storage for public resources. (#18038) (#18203)
liushilongbuaa Feb 28, 2024
1e8c79a
[ci] Migrate ubuntu and sonicbld agent pool to fix S360 alert. (#1909…
liushilongbuaa Jun 8, 2024
2dd7bdb
[build]: fix bug for compile sonic-platform-common caused by enable p…
AlanYoush Nov 25, 2023
b8b0151
[Centec] syncd containers based on buster should use python3 (#7185)
AlanYoush Nov 25, 2023
adccb45
[Centec][arm64] support new board E530-48s4x and E530-24x2q (#7189)
AlanYoush Nov 25, 2023
9f883a2
[centec][arm64] support sonic_installer on centec arm64
AlanYoush Nov 25, 2023
1f5328d
[centec][arm64] modify program_console_speed for centec e530 board
AlanYoush Nov 27, 2023
61fdd29
[centec][arm64] enable psample module for support sflow on arm64
AlanYoush Nov 27, 2023
4cb1d24
[centec] support TM.MX demo board v682-48Y8C_D
AlanYoush Nov 27, 2023
5d63aca
change sonic-linux-kernel submodule to 202012-centec
AlanYoush Nov 27, 2023
bd79e0d
[centec][arm64] upgrade tsingma soc support to cldk 2021.07
AlanYoush Nov 27, 2023
c35d056
[soc][ctcmac] Set cfg_release to 4 before cmu release
AlanYoush Nov 27, 2023
b484ed8
[soc][ctcmac] Set IGNORE_ANEG_ERR and IGNORE_LINK_FAILURE
AlanYoush Nov 27, 2023
8edeaa0
update sai to v1.7.1-4 for all centec platform(X86 CPU) and centec-ar…
AlanYoush Nov 27, 2023
96acad1
[centec][arm64] upgrade tsingma soc support to cldk 22.04
AlanYoush Nov 27, 2023
280831b
fix compile for ignore stretch docker
AlanYoush Nov 27, 2023
8084194
Fix compile error for update kdump version to 1.6.5
AlanYoush Nov 27, 2023
af8018e
remove system-health on centec arm64 board for performance
AlanYoush Dec 22, 2023
92cdc0b
update sai-plugin to v1.7.1-6 for centec-202012
AlanYoush Dec 28, 2023
5677d59
Fix openssh version error for compile
AlanYoush Dec 29, 2023
b69e192
update README.md to guide the handling of compilation errors
centecqianj Aug 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-Official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ schedules:
- 202012
always: true

pool: sonicbld
pool: sonicbld-1es

stages:
- stage: Build
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-UpgrateVersion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ resources:
ref: master
endpoint: sonic-net

pool: sonicbld
pool: sonicbld-1es

parameters:
- name: jobFilters
Expand Down
4 changes: 2 additions & 2 deletions .azure-pipelines/build-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ parameters:
- name: pool
type: string
values:
- sonicbld
- sonicbld-1es
- sonicbld_8c
default: sonicbld
default: sonicbld-1es

- name: dbg_image
type: boolean
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/docker-sonic-mgmt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ stages:
- stage: Build
jobs:
- job: Build
pool: sonicbld
pool: sonicbld-1es
timeoutInMinutes: 360
steps:
- template: cleanup.yml
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/docker-sonic-slave.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ stages:
- ${{ each arch in parameters.arches }}:
- template: .azure-pipelines/docker-sonic-slave-template.yml@buildimage
parameters:
pool: sonicbld
pool: sonicbld-1es
arch: ${{ arch }}
dist: ${{ dist }}
${{ if ne(arch, 'amd64') }}:
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/dpkg-cache-cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pr: none

jobs:
- job: Build
pool: sonicbld
pool: sonicbld-1es
timeoutInMinutes: 5
steps:
- checkout: none
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/official-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ variables:

stages:
- stage: Build
pool: sonicbld
pool: sonicbld-1es
variables:
CACHE_MODE: wcache
${{ if eq(variables['Build.SourceBranchName'], '202012') }}:
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/template-commonlib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- job: Build_${{ arch }}
timeoutInMinutes: 120
${{ if eq(arch,'amd64') }}:
pool: sonicbld
pool: sonicbld-1es
${{ else }}:
pool: sonicbld-${{ arch }}
variables:
Expand Down
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
url = https://github.com/sonic-net/sonic-swss-common
[submodule "sonic-linux-kernel"]
path = src/sonic-linux-kernel
url = https://github.com/sonic-net/sonic-linux-kernel
url = https://github.com/CentecNetworks/sonic-linux-kernel
[submodule "sonic-sairedis"]
path = src/sonic-sairedis
url = https://github.com/sonic-net/sonic-sairedis
Expand All @@ -30,8 +30,8 @@
url = https://github.com/p4lang/ptf.git
[submodule "src/sonic-utilities"]
path = src/sonic-utilities
url = https://github.com/sonic-net/sonic-utilities
branch = 202012
url = https://github.com/CentecNetworks/sonic-utilities
branch = 202012-centec
[submodule "platform/broadcom/sonic-platform-modules-arista"]
path = platform/broadcom/sonic-platform-modules-arista
url = https://github.com/aristanetworks/sonic
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SONiC make file

NOJESSIE ?= 1
NOSTRETCH ?= 0
NOSTRETCH ?= 1

ifeq ($(NOJESSIE),0)
BUILD_JESSIE=1
Expand Down
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,14 @@ To build SONiC installer image and docker images, run the following commands:
# Build SONiC image
make all

**NOTE**:

- If there are compilation issues caused by the absence of deb paths for Buster or Stretch, you can try the following command:
~~~
make configure PLATFORM=centec-arm64 PLATFORM_ARCH=arm64 MIRROR_SNAPSHOT=y
make all MIRROR_SNAPSHOT=y
~~~

## Usage for ARM Architecture
To build Arm32 bit for (ARMHF) plaform
ARM build has dependency in docker version 18,
Expand Down
20 changes: 10 additions & 10 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ variables:

stages:
- stage: BuildVS
pool: sonicbld
pool: sonicbld-1es
variables:
CACHE_MODE: rcache
VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
Expand All @@ -56,7 +56,7 @@ stages:
- name: vs

- stage: Build
pool: sonicbld
pool: sonicbld-1es
dependsOn: []
variables:
CACHE_MODE: rcache
Expand Down Expand Up @@ -134,9 +134,9 @@ stages:
testRunTitle: vstest

- job: t0_elastictest
pool: ubuntu-20.04
pool: sonic-ubuntu-1c
displayName: "kvmtest-t0 by Elastictest"
timeoutInMinutes: 240
timeoutInMinutes: 400
continueOnError: false
steps:
- template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
Expand All @@ -147,9 +147,9 @@ stages:
MGMT_BRANCH: "202012"

- job: t0_2vlans_elastictest
pool: ubuntu-20.04
pool: sonic-ubuntu-1c
displayName: "kvmtest-t0-2vlans by Elastictest"
timeoutInMinutes: 240
timeoutInMinutes: 400
continueOnError: false
steps:
- template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
Expand All @@ -162,9 +162,9 @@ stages:
MGMT_BRANCH: "202012"

- job: t1_lag_elastictest
pool: ubuntu-20.04
pool: sonic-ubuntu-1c
displayName: "kvmtest-t1-lag by Elastictest"
timeoutInMinutes: 240
timeoutInMinutes: 400
continueOnError: false
steps:
- template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
Expand All @@ -175,9 +175,9 @@ stages:
MGMT_BRANCH: "202012"

- job: dualtor_elastictest
pool: ubuntu-20.04
pool: sonic-ubuntu-1c
displayName: "kvmtest-dualtor-t0 by Elastictest"
timeoutInMinutes: 240
timeoutInMinutes: 400
continueOnError: false
steps:
- template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
Expand Down
54 changes: 27 additions & 27 deletions device/centec/arm64-centec_e530_24x2c-r0/E530-24x2c/port_config.ini
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
# name lanes alias speed
Ethernet1 0 eth-0-1 10000
Ethernet2 1 eth-0-2 10000
Ethernet3 2 eth-0-3 10000
Ethernet4 3 eth-0-4 10000
Ethernet5 8 eth-0-5 10000
Ethernet6 9 eth-0-6 10000
Ethernet7 10 eth-0-7 10000
Ethernet8 11 eth-0-8 10000
Ethernet9 20 eth-0-9 10000
Ethernet10 21 eth-0-10 10000
Ethernet11 22 eth-0-11 10000
Ethernet12 23 eth-0-12 10000
Ethernet13 12 eth-0-13 10000
Ethernet14 13 eth-0-14 10000
Ethernet15 14 eth-0-15 10000
Ethernet16 15 eth-0-16 10000
Ethernet17 24 eth-0-17 10000
Ethernet18 25 eth-0-18 10000
Ethernet19 26 eth-0-19 10000
Ethernet20 27 eth-0-20 10000
Ethernet21 28 eth-0-21 10000
Ethernet22 29 eth-0-22 10000
Ethernet23 30 eth-0-23 10000
Ethernet24 31 eth-0-24 10000
Ethernet25 61,60,63,62 eth-0-25 100000
Ethernet26 45,44,47,46 eth-0-26 100000
# name lanes alias index speed fec
Ethernet0 0 eth-0-1 0 10000 none
Ethernet1 1 eth-0-2 1 10000 none
Ethernet2 2 eth-0-3 2 10000 none
Ethernet3 3 eth-0-4 3 10000 none
Ethernet4 8 eth-0-5 4 10000 none
Ethernet5 9 eth-0-6 5 10000 none
Ethernet6 10 eth-0-7 6 10000 none
Ethernet7 11 eth-0-8 7 10000 none
Ethernet8 20 eth-0-9 8 10000 none
Ethernet9 21 eth-0-10 9 10000 none
Ethernet10 22 eth-0-11 10 10000 none
Ethernet11 23 eth-0-12 11 10000 none
Ethernet12 12 eth-0-13 12 10000 none
Ethernet13 13 eth-0-14 13 10000 none
Ethernet14 14 eth-0-15 14 10000 none
Ethernet15 15 eth-0-16 15 10000 none
Ethernet16 24 eth-0-17 16 10000 none
Ethernet17 25 eth-0-18 17 10000 none
Ethernet18 26 eth-0-19 18 10000 none
Ethernet19 27 eth-0-20 19 10000 none
Ethernet20 28 eth-0-21 20 10000 none
Ethernet21 29 eth-0-22 21 10000 none
Ethernet22 30 eth-0-23 22 10000 none
Ethernet23 31 eth-0-24 23 10000 none
Ethernet24 61,60,63,62 eth-0-25 24 100000 none
Ethernet25 45,44,47,46 eth-0-26 25 100000 none
11 changes: 11 additions & 0 deletions device/centec/arm64-centec_e530_24x2c-r0/fancontrol
Original file line number Diff line number Diff line change
@@ -1 +1,12 @@
# Configuration file generated by pwmconfig, changes will be lost
INTERVAL=10
DEVPATH=hwmon1=devices/platform/soc/soc:fan-ctc5236
DEVNAME=hwmon1=ctc5236fan
FCTEMPS=hwmon1/pwm1=hwmon1/temp1_input hwmon1/pwm2=hwmon1/temp1_input hwmon1/pwm3=hwmon1/temp1_input
FCFANS=hwmon1/pwm1=hwmon1/fan1_input hwmon1/pwm2=hwmon1/fan2_input hwmon1/pwm3=hwmon1/fan3_input
MINTEMP=hwmon1/pwm1=30 hwmon1/pwm2=30 hwmon1/pwm3=30
MAXTEMP=hwmon1/pwm1=90 hwmon1/pwm2=90 hwmon1/pwm3=90
MINSTART=hwmon1/pwm1=12 hwmon1/pwm2=12 hwmon1/pwm3=12
MINSTOP=hwmon1/pwm1=6 hwmon1/pwm2=6 hwmon1/pwm3=6
MINPWM=hwmon1/pwm1=6 hwmon1/pwm2=6 hwmon1/pwm3=6
MAXPWM=hwmon1/pwm1=18 hwmon1/pwm2=18 hwmon1/pwm3=18
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"chassis": {
"E530-24x2c": {
"component": {
}
}
}
}
11 changes: 11 additions & 0 deletions device/centec/arm64-centec_e530_24x2c-r0/platform_reboot
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/python
import os

def main():
# reboot the system
os.system('echo 502 > /sys/class/gpio/export')
os.system('echo out > /sys/class/gpio/gpio502/direction')
os.system('echo 1 > /sys/class/gpio/gpio502/value')

if __name__ == "__main__":
main()
4 changes: 3 additions & 1 deletion device/centec/arm64-centec_e530_24x2c-r0/plugins/eeprom.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env python

#############################################################################
# Centec E550-24X8Y2C
#
Expand All @@ -10,7 +12,7 @@
try:
from sonic_eeprom import eeprom_tlvinfo
except ImportError as e:
raise ImportError(str(e) + "- required module not found")
raise ImportError (str(e) + "- required module not found")


class board(eeprom_tlvinfo.TlvInfoDecoder):
Expand Down
Loading