Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions .azure-pipelines/build-sairedis-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ parameters:
type: number
default: 90

- name: sonic_slave
type: string

- name: debian_version
type: string
default: buster
Expand Down Expand Up @@ -49,7 +46,7 @@ jobs:
vmImage: 'ubuntu-22.04'

container:
image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}
image: sonicdev-microsoft.azurecr.io:443/sonic-slave-${{ parameters.debian_version }}:$(BUILD_BRANCH)-${{ parameters.arch }}
options: "--privileged"

steps:
Expand Down
5 changes: 1 addition & 4 deletions .azure-pipelines/build-swss-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ parameters:
type: number
default: 90

- name: sonic_slave
type: string

- name: debian_version
type: string

Expand All @@ -45,7 +42,7 @@ jobs:
vmImage: 'ubuntu-22.04'

container:
image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}
image: sonicdev-microsoft.azurecr.io:443/sonic-slave-${{ parameters.debian_version }}:$(BUILD_BRANCH)-${{ parameters.arch }}

steps:
- checkout: sonic-swss
Expand Down
5 changes: 1 addition & 4 deletions .azure-pipelines/build-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ parameters:
type: number
default: 60

- name: sonic_slave
type: string

- name: artifact_name
type: string

Expand Down Expand Up @@ -53,7 +50,7 @@ jobs:
vmImage: 'ubuntu-22.04'

container:
image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}
image: sonicdev-microsoft.azurecr.io:443/sonic-slave-${{ parameters.debian_version }}:$(BUILD_BRANCH)-${{ parameters.arch }}

steps:
- checkout: self
Expand Down
31 changes: 26 additions & 5 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ stages:
- template: .azure-pipelines/build-template.yml
parameters:
arch: amd64
sonic_slave: sonic-slave-${{ parameters.debian_version }}:$(BUILD_BRANCH)
artifact_name: sonic-swss-common-${{ parameters.debian_version }}
run_unit_test: true
archive_gcov: true
Expand All @@ -204,7 +203,6 @@ stages:
arch: armhf
timeout: 180
pool: sonicso1ES-armhf
sonic_slave: sonic-slave-${{ parameters.debian_version }}-armhf:$(BUILD_BRANCH)
artifact_name: sonic-swss-common-${{ parameters.debian_version }}.armhf
debian_version: ${{ parameters.debian_version }}

Expand All @@ -213,18 +211,42 @@ stages:
arch: arm64
timeout: 180
pool: sonicso1ES-arm64
sonic_slave: sonic-slave-${{ parameters.debian_version }}-arm64:$(BUILD_BRANCH)
artifact_name: sonic-swss-common-${{ parameters.debian_version }}.arm64
debian_version: ${{ parameters.debian_version }}

- stage: BuildTrixie
dependsOn: BuildArm
condition: succeeded('BuildArm')
jobs:
- template: .azure-pipelines/build-template.yml
parameters:
arch: amd64
artifact_name: sonic-swss-common-trixie
debian_version: trixie

- template: .azure-pipelines/build-template.yml
parameters:
arch: armhf
timeout: 180
pool: sonicso1ES-armhf
artifact_name: sonic-swss-common-trixie.armhf
debian_version: trixie

- template: .azure-pipelines/build-template.yml
parameters:
arch: arm64
timeout: 180
pool: sonicso1ES-arm64
artifact_name: sonic-swss-common-trixie.arm64
debian_version: trixie

- stage: BuildSairedis
dependsOn: Build
condition: succeeded('Build')
jobs:
- template: .azure-pipelines/build-sairedis-template.yml
parameters:
arch: amd64
sonic_slave: sonic-slave-${{ parameters.debian_version }}:$(BUILD_BRANCH)
swss_common_artifact_name: sonic-swss-common-${{ parameters.debian_version }}
artifact_name: sonic-sairedis-${{ parameters.debian_version }}
syslog_artifact_name: sonic-sairedis.syslog
Expand All @@ -238,7 +260,6 @@ stages:
parameters:
arch: amd64
pool: sonicso1ES-amd64
sonic_slave: sonic-slave-${{ parameters.debian_version }}:$(BUILD_BRANCH)
swss_common_artifact_name: sonic-swss-common-${{ parameters.debian_version }}
sairedis_artifact_name: sonic-sairedis-${{ parameters.debian_version }}
artifact_name: sonic-swss-${{ parameters.debian_version }}
Expand Down
Loading