diff --git a/.azure-pipelines/azure-pipelines-Official.yml b/.azure-pipelines/azure-pipelines-Official.yml index 56d88751f6..3a5f59dda8 100644 --- a/.azure-pipelines/azure-pipelines-Official.yml +++ b/.azure-pipelines/azure-pipelines-Official.yml @@ -14,7 +14,7 @@ schedules: - 202012 always: true -pool: sonicbld-1es +pool: sonicso1ES-amd64 stages: - stage: Build diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml index b26f501cf2..3fd8b1dac2 100644 --- a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml +++ b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml @@ -26,7 +26,7 @@ resources: ref: master endpoint: sonic-net -pool: sonicbld-1es +pool: sonicso1ES-amd64 parameters: - name: 'jobFilters' diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml index 5781951307..c54068533b 100644 --- a/.azure-pipelines/azure-pipelines-build.yml +++ b/.azure-pipelines/azure-pipelines-build.yml @@ -73,7 +73,7 @@ jobs: - name: centec-arm64 ${{ if not(parameters.qemuOrCrossBuild) }}: - pool: sonicbld-arm64 + pool: sonicso1ES-arm64 timeoutInMinutes: 2880 variables: PLATFORM_ARCH: arm64 @@ -88,7 +88,7 @@ jobs: - name: marvell-armhf ${{ if not(parameters.qemuOrCrossBuild) }}: - pool: sonicbld-armhf + pool: sonicso1ES-armhf timeoutInMinutes: 2880 variables: PLATFORM_NAME: marvell @@ -96,7 +96,7 @@ jobs: - name: marvell-arm64 ${{ if not(parameters.qemuOrCrossBuild) }}: - pool: sonicbld-arm64 + pool: sonicso1ES-arm64 timeoutInMinutes: 2880 variables: PLATFORM_NAME: marvell @@ -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 diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml index 813126792e..85d660f586 100644 --- a/.azure-pipelines/build-template.yml +++ b/.azure-pipelines/build-template.yml @@ -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 diff --git a/.azure-pipelines/docker-sonic-mgmt-py3-only.yml b/.azure-pipelines/docker-sonic-mgmt-py3-only.yml index 8019e957fd..af913b300c 100644 --- a/.azure-pipelines/docker-sonic-mgmt-py3-only.yml +++ b/.azure-pipelines/docker-sonic-mgmt-py3-only.yml @@ -32,7 +32,7 @@ stages: - stage: Build jobs: - job: Build - pool: sonicbld-1es + pool: sonicso1ES-amd64 timeoutInMinutes: 360 steps: - template: cleanup.yml diff --git a/.azure-pipelines/docker-sonic-mgmt.yml b/.azure-pipelines/docker-sonic-mgmt.yml index 924e4230df..56c4034888 100644 --- a/.azure-pipelines/docker-sonic-mgmt.yml +++ b/.azure-pipelines/docker-sonic-mgmt.yml @@ -32,7 +32,7 @@ stages: - stage: Build jobs: - job: Build - pool: sonicbld-1es + pool: sonicso1ES-amd64 timeoutInMinutes: 360 steps: - template: cleanup.yml diff --git a/.azure-pipelines/docker-sonic-slave-template.yml b/.azure-pipelines/docker-sonic-slave-template.yml index 8bf7540e18..f47f5cddd9 100644 --- a/.azure-pipelines/docker-sonic-slave-template.yml +++ b/.azure-pipelines/docker-sonic-slave-template.yml @@ -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 }} diff --git a/.azure-pipelines/docker-sonic-slave.yml b/.azure-pipelines/docker-sonic-slave.yml index 6b4da92c69..58f3488a1a 100644 --- a/.azure-pipelines/docker-sonic-slave.yml +++ b/.azure-pipelines/docker-sonic-slave.yml @@ -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 @@ -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 }} diff --git a/.azure-pipelines/dpkg-cache-cleanup.yml b/.azure-pipelines/dpkg-cache-cleanup.yml index 7bac6997e4..ab1b7fa52a 100644 --- a/.azure-pipelines/dpkg-cache-cleanup.yml +++ b/.azure-pipelines/dpkg-cache-cleanup.yml @@ -16,7 +16,7 @@ pr: none jobs: - job: Amd - pool: sonicbld-1es + pool: sonicso1ES-amd64 timeoutInMinutes: 5 steps: - checkout: none @@ -26,7 +26,7 @@ jobs: df -h displayName: clean dpkg cache - job: Armhf - pool: sonicbld-armhf + pool: sonicso1ES-armhf timeoutInMinutes: 5 steps: - checkout: none @@ -36,7 +36,7 @@ jobs: df -h displayName: clean dpkg cache - job: Arm64 - pool: sonicbld-arm64 + pool: sonicso1ES-arm64 timeoutInMinutes: 5 steps: - checkout: none diff --git a/.azure-pipelines/official-build-cache.yml b/.azure-pipelines/official-build-cache.yml index 0f7b34e9bd..07b759a5f6 100644 --- a/.azure-pipelines/official-build-cache.yml +++ b/.azure-pipelines/official-build-cache.yml @@ -24,7 +24,7 @@ pr: none stages: - stage: Build - pool: sonicbld-1es + pool: sonicso1ES-amd64 variables: - name: CACHE_MODE value: cache @@ -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 diff --git a/.azure-pipelines/official-build-vs-with-test.yml b/.azure-pipelines/official-build-vs-with-test.yml index 7325efbc7e..1f35ba3086 100644 --- a/.azure-pipelines/official-build-vs-with-test.yml +++ b/.azure-pipelines/official-build-vs-with-test.yml @@ -51,7 +51,7 @@ variables: stages: - stage: BuildVS - pool: sonicbld-1es + pool: sonicso1ES-amd64 jobs: - template: azure-pipelines-build.yml parameters: diff --git a/.azure-pipelines/official-build.yml b/.azure-pipelines/official-build.yml index a228529b4a..86aef8fc09 100644 --- a/.azure-pipelines/official-build.yml +++ b/.azure-pipelines/official-build.yml @@ -34,7 +34,7 @@ variables: stages: - stage: Build - pool: sonicbld-1es + pool: sonicso1ES-amd64 variables: - group: Container-Registry - name: CACHE_MODE diff --git a/.azure-pipelines/template-commonlib.yml b/.azure-pipelines/template-commonlib.yml index 85b97398d3..4b99e01611 100644 --- a/.azure-pipelines/template-commonlib.yml +++ b/.azure-pipelines/template-commonlib.yml @@ -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: diff --git a/Makefile.work b/Makefile.work index fe14eebaed..23a3e272fe 100644 --- a/Makefile.work +++ b/Makefile.work @@ -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 @@ -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. diff --git a/azure-pipelines.yml b/azure-pipelines.yml index adc2f284b0..dbed20485d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -51,7 +51,7 @@ variables: stages: - stage: BuildVS - pool: sonicbld-1es + pool: sonicso1ES-amd64 jobs: - template: .azure-pipelines/azure-pipelines-build.yml parameters: @@ -60,7 +60,7 @@ stages: - name: vs - stage: Build - pool: sonicbld-1es + pool: sonicso1ES-amd64 dependsOn: [] jobs: - template: .azure-pipelines/azure-pipelines-build.yml @@ -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 diff --git a/dockers/docker-base-bullseye/Dockerfile.j2 b/dockers/docker-base-bullseye/Dockerfile.j2 index 0ec093c901..4bf0a1687f 100644 --- a/dockers/docker-base-bullseye/Dockerfile.j2 +++ b/dockers/docker-base-bullseye/Dockerfile.j2 @@ -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 diff --git a/files/build/versions/default/versions-mirror b/files/build/versions/default/versions-mirror index 2153472776..5085c10ee7 100644 --- a/files/build/versions/default/versions-mirror +++ b/files/build/versions/default/versions-mirror @@ -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