Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into log_resize
Browse files Browse the repository at this point in the history
  • Loading branch information
@dgsudharsan
dgsudharsan committed Jan 9, 2022
2 parents 1d9702a + 3e46582 commit 24d66b7
Show file tree
Hide file tree
Showing 119 changed files with 2,482 additions and 2,587 deletions.
6 changes: 3 additions & 3 deletions .azure-pipelines/azure-pipelines-UpgrateVersion.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ schedules:
displayName: Daily Build
branches:
include:
- 20????
- 20*
exclude:
- 200???
- 201???
- 200*
- 201*
- 202006
always: true

Expand Down
5 changes: 3 additions & 2 deletions build_debian.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,8 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
python-is-python3 \
cron \
libprotobuf23 \
libgrpc++ \
libgrpc++1 \
libgrpc10 \
haveged \
fdisk \
gpg \
Expand Down Expand Up @@ -585,7 +586,7 @@ sudo rm -f $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS
sudo du -hsx $FILESYSTEM_ROOT
sudo mkdir -p $FILESYSTEM_ROOT/var/lib/docker
scripts/collect_host_image_version_files.sh $TARGET_PATH $FILESYSTEM_ROOT
sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -e boot -e var/lib/docker -e $PLATFORM_DIR
sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -comp zstd -b 1M -e boot -e var/lib/docker -e $PLATFORM_DIR

# Ensure admin gid is 1000
gid_user=$(sudo LANG=C chroot $FILESYSTEM_ROOT id -g $USERNAME) || gid_user="none"
Expand Down
102 changes: 92 additions & 10 deletions device/dell/x86_64-dell_s6000_s1220-r0/platform.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,41 +25,59 @@
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
},
{
"name": "FanTray1-Fan2",
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
},
{
"name": "FanTray2-Fan1",
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
},
{
"name": "FanTray2-Fan2",
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
},
{
"name": "FanTray3-Fan1",
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
},
{
"name": "FanTray3-Fan2",
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
}
],
Expand All @@ -76,13 +94,19 @@
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
},
{
"name": "FanTray1-Fan2",
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
}
]
Expand All @@ -99,13 +123,19 @@
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
},
{
"name": "FanTray2-Fan2",
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
}
]
Expand All @@ -122,13 +152,19 @@
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
},
{
"name": "FanTray3-Fan2",
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
}
]
Expand All @@ -146,17 +182,28 @@
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
}
],
"thermals": [
{
"name": "PSU1-Sensor 1",
"controllable": false
"controllable": false,
"low-crit-threshold": false,
"high-crit-threshold": false,
"minimum-recorded": false,
"maximum-recorded": false
},
{
"name": "PSU1-Sensor 2",
"controllable": false
"controllable": false,
"low-crit-threshold": false,
"high-crit-threshold": false,
"minimum-recorded": false,
"maximum-recorded": false
}
]
},
Expand All @@ -171,45 +218,80 @@
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
}
],
"thermals": [
{
"name": "PSU2-Sensor 1",
"controllable": false
"controllable": false,
"low-crit-threshold": false,
"high-crit-threshold": false,
"minimum-recorded": false,
"maximum-recorded": false
},
{
"name": "PSU2-Sensor 2",
"controllable": false
"controllable": false,
"low-crit-threshold": false,
"high-crit-threshold": false,
"minimum-recorded": false,
"maximum-recorded": false
}
]
}
],
"thermals": [
{
"name": "ASIC On-board",
"controllable": false
"controllable": false,
"low-crit-threshold": false,
"high-crit-threshold": false,
"minimum-recorded": false,
"maximum-recorded": false
},
{
"name": "NIC",
"controllable": false
"controllable": false,
"low-crit-threshold": false,
"high-crit-threshold": false,
"minimum-recorded": false,
"maximum-recorded": false
},
{
"name": "System Front",
"controllable": false
"controllable": false,
"low-crit-threshold": false,
"high-crit-threshold": false,
"minimum-recorded": false,
"maximum-recorded": false
},
{
"name": "DIMM",
"controllable": false
"controllable": false,
"low-crit-threshold": false,
"high-crit-threshold": false,
"minimum-recorded": false,
"maximum-recorded": false
},
{
"name": "CPU Core 0",
"controllable": false
"controllable": false,
"low-crit-threshold": false,
"high-crit-threshold": false,
"minimum-recorded": false,
"maximum-recorded": false
},
{
"name": "CPU Core 1",
"controllable": false
"controllable": false,
"low-crit-threshold": false,
"high-crit-threshold": false,
"minimum-recorded": false,
"maximum-recorded": false
}
],
"modules": [],
Expand Down
Loading

0 comments on commit 24d66b7

Please sign in to comment.