Skip to content

[202412] Code sync sonic-net/sonic-buildimage:202411 => 202412 #1800

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.

Sign up for GitHub

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

Merged
r12f merged 5 commits into from
Nov 16, 2025
Merged

[202412] Code sync sonic-net/sonic-buildimage:202411 => 202412 #1800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b6a493b
[build] Update debian snapshot mirror to upgrade redis-server version…
liushilongbuaa Oct 31, 2025
bb2625e
[submodule] Update submodule sonic-gnmi to the latest HEAD automatica…
mssonicbld Nov 6, 2025
7c2e2f8
[ci] Migrate agent pool from sonicbld-1es to sonicso1ES-amd64 (#24502)
liushilongbuaa Nov 12, 2025
814e269
Merge remote-tracking branch 'base/202411' into code-sync-202412
r12f Nov 12, 2025
e2a28e4
[build] Fix Too many open file error after roll back docker-ce (#24511)
liushilongbuaa Nov 13, 2025
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ schedules:
- 202012
always: true

pool: sonicbld-1es
pool: sonicso1ES-amd64

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

pool: sonicbld-1es
pool: sonicso1ES-amd64

parameters:
- name: 'jobFilters'
Expand Down
10 changes: 5 additions & 5 deletions .azure-pipelines/azure-pipelines-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:

- name: centec-arm64
${{ if not(parameters.qemuOrCrossBuild) }}:
pool: sonicbld-arm64
pool: sonicso1ES-arm64
timeoutInMinutes: 2880
variables:
PLATFORM_ARCH: arm64
Expand All @@ -88,15 +88,15 @@ jobs:

- name: marvell-armhf
${{ if not(parameters.qemuOrCrossBuild) }}:
pool: sonicbld-armhf
pool: sonicso1ES-armhf
timeoutInMinutes: 2880
variables:
PLATFORM_NAME: marvell
PLATFORM_ARCH: armhf

- name: marvell-arm64
${{ if not(parameters.qemuOrCrossBuild) }}:
pool: sonicbld-arm64
pool: sonicso1ES-arm64
timeoutInMinutes: 2880
variables:
PLATFORM_NAME: marvell
Expand All @@ -119,12 +119,12 @@ jobs:
platform_rpc: nephos

- name: pensando
pool: sonicbld-arm64
pool: sonicso1ES-arm64
variables:
PLATFORM_ARCH: arm64

- name: nvidia-bluefield
pool: sonicbld-arm64
pool: sonicso1ES-arm64
variables:
PLATFORM_ARCH: arm64

Expand Down
5 changes: 2 additions & 3 deletions .azure-pipelines/build-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,8 @@ parameters:
- name: pool
type: string
values:
- sonicbld-1es
- sonicbld_8c
default: sonicbld-1es
- sonicso1ES-amd64
default: sonicso1ES-amd64

- name: dbg_image
type: boolean
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/docker-sonic-mgmt-py3-only.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ stages:
- stage: Build
jobs:
- job: Build
pool: sonicbld-1es
pool: sonicso1ES-amd64
timeoutInMinutes: 360
steps:
- template: cleanup.yml
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/docker-sonic-mgmt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ stages:
- stage: Build
jobs:
- job: Build
pool: sonicbld-1es
pool: sonicso1ES-amd64
timeoutInMinutes: 360
steps:
- template: cleanup.yml
Expand Down
8 changes: 4 additions & 4 deletions .azure-pipelines/docker-sonic-slave-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ parameters:
default: sonicdev
- name: pool
type: string
default: sonicbld-1es
default: sonicso1ES-amd64
values:
- sonicbld-1es
- sonicbld-arm64
- sonicbld-armhf
- sonicso1ES-amd64
- sonicso1ES-arm64
- sonicso1ES-armhf

jobs:
- job: sonic_slave_${{ parameters.dist }}${{ parameters.march }}
Expand Down
4 changes: 2 additions & 2 deletions .azure-pipelines/docker-sonic-slave.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ stages:
- ${{ if endswith(variables['Build.DefinitionName'], dist) }}:
- template: .azure-pipelines/docker-sonic-slave-template.yml@buildimage
parameters:
pool: sonicbld-1es
pool: sonicso1ES-amd64
arch: amd64
dist: ${{ dist }}
- stage: Build_native_arm
Expand All @@ -74,7 +74,7 @@ stages:
- ${{ if ne(arch, 'amd64') }}:
- template: .azure-pipelines/docker-sonic-slave-template.yml@buildimage
parameters:
pool: sonicbld-${{ arch }}
pool: sonicso1ES-${{ arch }}
arch: ${{ arch }}
dist: ${{ dist }}
march: _${{ arch }}
6 changes: 3 additions & 3 deletions .azure-pipelines/dpkg-cache-cleanup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pr: none

jobs:
- job: Amd
pool: sonicbld-1es
pool: sonicso1ES-amd64
timeoutInMinutes: 5
steps:
- checkout: none
Expand All @@ -26,7 +26,7 @@ jobs:
df -h
displayName: clean dpkg cache
- job: Armhf
pool: sonicbld-armhf
pool: sonicso1ES-armhf
timeoutInMinutes: 5
steps:
- checkout: none
Expand All @@ -36,7 +36,7 @@ jobs:
df -h
displayName: clean dpkg cache
- job: Arm64
pool: sonicbld-arm64
pool: sonicso1ES-arm64
timeoutInMinutes: 5
steps:
- checkout: none
Expand Down
4 changes: 2 additions & 2 deletions .azure-pipelines/official-build-cache.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pr: none

stages:
- stage: Build
pool: sonicbld-1es
pool: sonicso1ES-amd64
variables:
- name: CACHE_MODE
value: cache
Expand All @@ -46,7 +46,7 @@ stages:
docker_syncd_rpc_image: yes
platform_rpc: mlnx
- name: marvell-armhf
pool: sonicbld-armhf
pool: sonicso1ES-armhf
timeoutInMinutes: 1200
variables:
PLATFORM_NAME: marvell
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/official-build-vs-with-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ variables:

stages:
- stage: BuildVS
pool: sonicbld-1es
pool: sonicso1ES-amd64
jobs:
- template: azure-pipelines-build.yml
parameters:
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/official-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ variables:

stages:
- stage: Build
pool: sonicbld-1es
pool: sonicso1ES-amd64
variables:
- group: Container-Registry
- name: CACHE_MODE
Expand Down
4 changes: 2 additions & 2 deletions .azure-pipelines/template-commonlib.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
- job: Build_${{ arch }}
timeoutInMinutes: 120
${{ if eq(arch,'amd64') }}:
pool: sonicbld-1es
pool: sonicso1ES-amd64
${{ else }}:
pool: sonicbld-${{ arch }}
pool: sonicso1ES-${{ arch }}
variables:
- template: template-variables.yml
steps:
Expand Down
3 changes: 2 additions & 1 deletion Makefile.work
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ $(error Add your user account to docker group and use your user account to make.
endif

# Check for j2cli availability
J2_VER := $(shell j2 --version 2>&1 | grep j2cli | awk '{printf $$2}')
J2_VER := $(shell j2 --version 2>&1 | grep j2 | awk '{printf $$2}')
ifeq ($(J2_VER),)
$(error Please install j2cli (sudo pip install j2cli))
endif
Expand Down Expand Up @@ -310,6 +310,7 @@ DOCKER_RUN := docker run --rm=true --privileged --init \
-e "https_proxy=$(https_proxy)" \
-e "no_proxy=$(no_proxy)" \
-i$(shell { if [ -t 0 ]; then echo t; fi }) \
--ulimit nofile=524288:524288 \
$(SONIC_BUILDER_EXTRA_CMDLINE)

# Mount the $(DOCKER_ROOT) to /var/lib/docker in the slave container, the overlay fs is not supported as dockerd root folder.
Expand Down
8 changes: 4 additions & 4 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ variables:

stages:
- stage: BuildVS
pool: sonicbld-1es
pool: sonicso1ES-amd64
jobs:
- template: .azure-pipelines/azure-pipelines-build.yml
parameters:
Expand All @@ -60,7 +60,7 @@ stages:
- name: vs

- stage: Build
pool: sonicbld-1es
pool: sonicso1ES-amd64
dependsOn: []
jobs:
- template: .azure-pipelines/azure-pipelines-build.yml
Expand All @@ -79,12 +79,12 @@ stages:
docker_syncd_rpc_image: yes
platform_rpc: mlnx
- name: marvell-arm64
pool: sonicbld-arm64
pool: sonicso1ES-arm64
variables:
PLATFORM_NAME: marvell
PLATFORM_ARCH: arm64
- name: marvell-armhf
pool: sonicbld-armhf
pool: sonicso1ES-armhf
timeoutInMinutes: 1200
variables:
PLATFORM_NAME: marvell
Expand Down
2 changes: 1 addition & 1 deletion dockers/docker-base-bullseye/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ RUN apt-get update && \

# default rsyslog version is 8.2110.0 which has a bug on log rate limit,
# use backport version 8.2206.0-1~bpo11+1
RUN apt-get -t bullseye-backports -y install rsyslog
RUN apt-get -y install rsyslog

# Upgrade pip via PyPI and uninstall the Debian version
RUN pip3 install --upgrade pip
Expand Down
28 changes: 14 additions & 14 deletions files/build/versions/default/versions-mirror
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ archive.ubuntu.com_ubuntu_dists_focal-updates==2025-03-09T01:25:39Z
deb.nodesource.com_node%5f14.x_dists_bookworm==2023-02-17T00:35:29Z
deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z
deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z
debian==20250308T000907Z
debian-security==20250308T000950Z
debian==20251014T002409Z
debian-security==20251014T002334Z
download.docker.com_linux_debian_dists_bookworm==2025-03-03T10:37:36Z
download.docker.com_linux_debian_dists_bullseye==2025-02-26T13:28:50Z
download.docker.com_linux_debian_dists_buster==2024-06-17T16:53:50Z
packages.trafficmanager.net_snapshot_debian-security_20250308T000950Z_dists_bookworm-security==2025-03-07T00:14:51Z
packages.trafficmanager.net_snapshot_debian-security_20250308T000950Z_dists_bullseye-security==2025-03-07T00:14:51Z
packages.trafficmanager.net_snapshot_debian-security_20250308T000950Z_dists_buster_updates==2024-12-29T19:56:34Z
packages.trafficmanager.net_snapshot_debian_20250308T000907Z_dists_bookworm==2025-01-11T10:25:55Z
packages.trafficmanager.net_snapshot_debian_20250308T000907Z_dists_bookworm-backports==2025-03-07T20:25:41Z
packages.trafficmanager.net_snapshot_debian_20250308T000907Z_dists_bookworm-updates==2025-03-07T20:25:41Z
packages.trafficmanager.net_snapshot_debian_20250308T000907Z_dists_bullseye==2024-08-31T11:02:15Z
packages.trafficmanager.net_snapshot_debian_20250308T000907Z_dists_bullseye-backports==2025-03-07T20:25:41Z
packages.trafficmanager.net_snapshot_debian_20250308T000907Z_dists_bullseye-updates==2025-03-07T20:25:41Z
packages.trafficmanager.net_snapshot_debian_20250308T000907Z_dists_buster==2023-06-10T08:53:33Z
packages.trafficmanager.net_snapshot_debian_20250308T000907Z_dists_buster-backports==2024-03-09T20:54:54Z
packages.trafficmanager.net_snapshot_debian_20250308T000907Z_dists_buster-updates==2023-06-10T08:55:10Z
packages.trafficmanager.net_snapshot_debian-security_20251014T002334Z_dists_bookworm-security==2025-03-07T00:14:51Z
packages.trafficmanager.net_snapshot_debian-security_20251014T002334Z_dists_bullseye-security==2025-03-07T00:14:51Z
packages.trafficmanager.net_snapshot_debian-security_20251014T002334Z_dists_buster_updates==2024-12-29T19:56:34Z
packages.trafficmanager.net_snapshot_debian_20251014T002409Z_dists_bookworm==2025-01-11T10:25:55Z
packages.trafficmanager.net_snapshot_debian_20251014T002409Z_dists_bookworm-backports==2025-03-07T20:25:41Z
packages.trafficmanager.net_snapshot_debian_20251014T002409Z_dists_bookworm-updates==2025-03-07T20:25:41Z
packages.trafficmanager.net_snapshot_debian_20251014T002409Z_dists_bullseye==2024-08-31T11:02:15Z
packages.trafficmanager.net_snapshot_debian_20251014T002409Z_dists_bullseye-backports==2025-03-07T20:25:41Z
packages.trafficmanager.net_snapshot_debian_20251014T002409Z_dists_bullseye-updates==2025-03-07T20:25:41Z
packages.trafficmanager.net_snapshot_debian_20251014T002409Z_dists_buster==2023-06-10T08:53:33Z
packages.trafficmanager.net_snapshot_debian_20251014T002409Z_dists_buster-backports==2024-03-09T20:54:54Z
packages.trafficmanager.net_snapshot_debian_20251014T002409Z_dists_buster-updates==2023-06-10T08:55:10Z
security.ubuntu.com_ubuntu_dists_focal-security==2025-03-08T21:44:06Z
Loading