Skip to content

Commit 89debec

Browse files
prabhataravindprabhataravind
authored
[code sync] Merge code from sonic-net/sonic-buildimage:202505 to 202506 (#1771)
```<br>* 866431a - (HEAD -> 202506) Merge branch '202505' of https://github.com/sonic-net/sonic-buildimage into 202506 (2025-10-31) [Sonic Automation] * bf78bc1 - (head/202505) [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#24376) (2025-10-30) [mssonicbld]<br>```
2 parents a43f4db + 4dbdee2 commit 89debec

25 files changed

+276
-100
lines changed

‎.azure-pipelines/azure-pipelines-Official.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ schedules:
1414
- 202012
1515
always: true
1616

17-
pool: sonicbld-1es
17+
pool: sonicso1ES-amd64
1818

1919
stages:
2020
- stage: Build

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,14 @@ resources:
2626
ref: master
2727
endpoint: sonic-net
2828

29-
pool: sonicbld-1es
29+
pool: sonicso1ES-amd64
3030

3131
parameters:
3232
- name: 'jobFilters'
3333
type: object
3434
default:
3535
- vs
3636
- broadcom
37-
- centec
38-
- centec-arm64
39-
- generic
4037
- marvell-prestera-armhf
4138
- marvell-prestera-arm64
4239
- mellanox
@@ -49,8 +46,8 @@ stages:
4946
steps:
5047
- script: |
5148
DEFAULT_MIRROR_URL_PREFIX=http://packages.trafficmanager.net
52-
DEBIAN_TIMESTAMP=$(curl $DEFAULT_MIRROR_URL_PREFIX/snapshot/debian/latest/timestamp)
53-
DEBIAN_SECURITY_TIMESTAMP=$(curl $DEFAULT_MIRROR_URL_PREFIX/snapshot/debian-security/latest/timestamp)
49+
DEBIAN_TIMESTAMP=$(curl $DEFAULT_MIRROR_URL_PREFIX/debian-snapshot/debian/latest)
50+
DEBIAN_SECURITY_TIMESTAMP=$(curl $DEFAULT_MIRROR_URL_PREFIX/debian-snapshot/debian-security/latest)
5451
echo "DEBIAN_TIMESTAMP=$DEBIAN_TIMESTAMP, DEBIAN_SECURITY_TIMESTAMP=$DEBIAN_SECURITY_TIMESTAMP"
5552
echo "##vso[task.setvariable variable=DEBIAN_TIMESTAMP;isOutput=true]$DEBIAN_TIMESTAMP"
5653
echo "##vso[task.setvariable variable=DEBIAN_SECURITY_TIMESTAMP;isOutput=true]$DEBIAN_SECURITY_TIMESTAMP"
@@ -74,7 +71,7 @@ stages:
7471
- template: azure-pipelines-build.yml
7572
parameters:
7673
jobFilters: ${{ parameters.jobFilters }}
77-
buildOptions: '${{ variables.VERSION_CONTROL_OPTIONS }} ENABLE_DOCKER_BASE_PULL=n SONIC_BUILD_JOBS=$(nproc) ENABLE_IMAGE_SIGNATURE=y'
74+
buildOptions: '${{ variables.VERSION_CONTROL_OPTIONS }} ENABLE_DOCKER_BASE_PULL=n SONIC_BUILD_JOBS=$(nproc) ENABLE_IMAGE_SIGNATURE=y NOBUSTER=1 NOBULLSEYE=1'
7875
preSteps:
7976
- template: .azure-pipelines/template-clean-sonic-slave.yml@buildimage
8077
- checkout: self

‎.azure-pipelines/azure-pipelines-build-vs-and-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ parameters:
8585

8686
stages:
8787
- stage: BuildVS
88-
pool: sonicbld-1es
88+
pool: sonicso1ES-amd64
8989
jobs:
9090
- template: azure-pipelines-build.yml
9191
parameters:

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

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -72,39 +72,20 @@ jobs:
7272
docker_syncd_rpc_image: yes
7373
platform_rpc: brcm
7474

75-
- name: centec
76-
variables:
77-
dbg_image: yes
78-
docker_syncd_rpc_image: yes
79-
platform_rpc: centec
80-
81-
- name: centec-arm64
82-
${{ if not(parameters.qemuOrCrossBuild) }}:
83-
pool: sonicbld-arm64
84-
timeoutInMinutes: 2880
85-
variables:
86-
PLATFORM_ARCH: arm64
87-
88-
- name: generic
89-
variables:
90-
dbg_image: yes
91-
9275
- name: marvell-teralynx
9376
variables:
9477
dbg_image: yes
9578

9679
- name: marvell-prestera-armhf
9780
${{ if not(parameters.qemuOrCrossBuild) }}:
98-
pool: sonicbld-armhf
99-
timeoutInMinutes: 2880
81+
pool: sonicso1ES-armhf
10082
variables:
10183
PLATFORM_NAME: marvell-prestera
10284
PLATFORM_ARCH: armhf
10385

10486
- name: marvell-prestera-arm64
10587
${{ if not(parameters.qemuOrCrossBuild) }}:
106-
pool: sonicbld-arm64
107-
timeoutInMinutes: 2880
88+
pool: sonicso1ES-arm64
10889
variables:
10990
PLATFORM_NAME: marvell-prestera
11091
PLATFORM_ARCH: arm64
@@ -125,12 +106,12 @@ jobs:
125106
platform_rpc: nephos
126107

127108
- name: pensando
128-
pool: sonicbld-arm64
109+
pool: sonicso1ES-arm64
129110
variables:
130111
PLATFORM_ARCH: arm64
131112

132113
- name: nvidia-bluefield
133-
pool: sonicbld-arm64
114+
pool: sonicso1ES-arm64
134115
variables:
135116
PLATFORM_ARCH: arm64
136117

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,13 @@ jobs:
6161
displayName: 'Checkout commit'
6262
- script: |
6363
set -x
64+
pwd
65+
realpath $(pwd)
66+
realpath /mnt/vss
6467
sudo setfacl -R -b $(Agent.BuildDirectory)
6568
displayName: 'setfacl'
6669
- script: |
70+
set -ex
6771
BRANCH_NAME=$(Build.SourceBranchName)
6872
[ -n "$SYSTEM_PULLREQUEST_PULLREQUESTID" ] && BRANCH_NAME="$SYSTEM_PULLREQUEST_TARGETBRANCH-$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER"
6973
git checkout -b $BRANCH_NAME

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ parameters:
3535
- name: pool
3636
type: string
3737
values:
38-
- sonicbld-1es
39-
- sonicbld_8c
40-
default: sonicbld-1es
38+
- sonicso1ES-amd64
39+
- sonicso1ES-arm64
40+
- sonicso1ES-armhf
41+
default: sonicso1ES-amd64
4142

4243
- name: dbg_image
4344
type: boolean

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ stages:
4040
- stage: Build
4141
jobs:
4242
- job: Build
43-
pool: sonicbld-1es
43+
pool: sonicso1ES-amd64
4444
timeoutInMinutes: 360
4545
steps:
4646
- template: cleanup.yml
@@ -70,7 +70,7 @@ stages:
7070
displayName: "Archive docker image sonic-mgmt"
7171

7272
- job: validate_docker_image_and_upload
73-
pool: sonicbld-1es
73+
pool: sonicso1ES-amd64
7474
timeoutInMinutes: 360
7575
dependsOn: Build
7676
steps:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ stages:
4040
- stage: Build
4141
jobs:
4242
- job: Build
43-
pool: sonicbld-1es
43+
pool: sonicso1ES-amd64
4444
timeoutInMinutes: 360
4545
steps:
4646
- template: cleanup.yml
@@ -69,7 +69,7 @@ stages:
6969
displayName: "Archive docker image sonic-mgmt"
7070

7171
- job: validate_docker_image_and_upload
72-
pool: sonicbld-1es
72+
pool: sonicso1ES-amd64
7373
timeoutInMinutes: 360
7474
dependsOn: Build
7575
steps:

‎.azure-pipelines/docker-sonic-slave-template.yml‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ parameters:
1010
- amd64
1111
- armhf
1212
- arm64
13-
- name: march
14-
type: string
15-
default: ''
1613
- name: dist
1714
type: string
1815
values:
@@ -29,22 +26,22 @@ parameters:
2926
default: sonicdev
3027
- name: pool
3128
type: string
32-
default: sonicbld-1es
29+
default: sonicso1ES-amd64
3330
values:
34-
- sonicbld-1es
35-
- sonicbld-arm64
36-
- sonicbld-armhf
31+
- sonicso1ES-amd64
32+
- sonicso1ES-arm64
33+
- sonicso1ES-armhf
3734

3835
jobs:
39-
- job: sonic_slave_${{ parameters.dist }}${{ parameters.march }}
36+
- job: sonic_slave_${{ parameters.dist }}_${{ parameters.arch }}
4037
timeoutInMinutes: 360
4138
variables:
42-
- template: /.azure-pipelines/template-variables.yml@buildimage
43-
- template: /.azure-pipelines/azure-pipelines-repd-build-variables.yml@buildimage
39+
- template: template-variables.yml
40+
- template: azure-pipelines-repd-build-variables.yml
4441
pool: ${{ parameters.pool }}
4542
steps:
4643
- template: cleanup.yml
47-
- template: /.azure-pipelines/template-clean-sonic-slave.yml@buildimage
44+
- template: template-clean-sonic-slave.yml
4845
- checkout: self
4946
clean: true
5047
- task: Docker@2
@@ -67,7 +64,7 @@ jobs:
6764
exit 0
6865
fi
6966
70-
DOCKER_DATA_ROOT_FOR_MULTIARCH=/data/march/docker BLDENV=${{ parameters.dist }} make -f Makefile.work configure $build_options PLATFORM=generic PLATFORM_ARCH=${{ parameters.arch }} $args || docker image ls $image_tag
67+
BLDENV=${{ parameters.dist }} make -f Makefile.work configure $build_options PLATFORM=generic PLATFORM_ARCH=${{ parameters.arch }} || docker image ls $image_tag
7168
if [[ "$(Build.Reason)" == "PullRequest" ]];then
7269
exit 0
7370
fi

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

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33
# Add steps that build, run tests, deploy, and more:
44
# https://aka.ms/yaml
55
# Build and push sonic-slave-[buster|jessie|stretch] images for amd64/armhf/arm64
6-
resources:
7-
repositories:
8-
- repository: buildimage
9-
type: github
10-
name: sonic-net/sonic-buildimage
11-
ref: master
12-
endpoint: sonic-net
13-
146
schedules:
157
- cron: "0 0 * * 0"
168
displayName: Weekly build
@@ -56,25 +48,13 @@ parameters:
5648
default: sonicdev
5749

5850
stages:
59-
- stage: Build_in_amd64
60-
jobs:
61-
- ${{ each dist in parameters.dists }}:
62-
- ${{ if endswith(variables['Build.DefinitionName'], dist) }}:
63-
- template: .azure-pipelines/docker-sonic-slave-template.yml@buildimage
64-
parameters:
65-
pool: sonicbld-1es
66-
arch: amd64
67-
dist: ${{ dist }}
68-
- stage: Build_native_arm
69-
dependsOn: []
51+
- stage: Build
7052
jobs:
7153
- ${{ each dist in parameters.dists }}:
7254
- ${{ if endswith(variables['Build.DefinitionName'], dist) }}:
7355
- ${{ each arch in parameters.arches }}:
74-
- ${{ if ne(arch, 'amd64') }}:
75-
- template: .azure-pipelines/docker-sonic-slave-template.yml@buildimage
76-
parameters:
77-
pool: sonicbld-${{ arch }}
78-
arch: ${{ arch }}
79-
dist: ${{ dist }}
80-
march: _${{ arch }}
56+
- template: docker-sonic-slave-template.yml
57+
parameters:
58+
pool: sonicso1ES-${{ arch }}
59+
arch: ${{ arch }}
60+
dist: ${{ dist }}

0 commit comments

Comments
 (0)