diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml index 0a83c33407..7f28740247 100644 --- a/.azure-pipelines/azure-pipelines-image-template.yml +++ b/.azure-pipelines/azure-pipelines-image-template.yml @@ -28,7 +28,7 @@ jobs: - template: cleanup.yml - ${{ parameters.preSteps }} - script: | - if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox)$"; then + if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-armhf)$"; then CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=$(CACHE_MODE) SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/$(PLATFORM_AZP)" BUILD_OPTIONS="$(BUILD_OPTIONS) $CACHE_OPTIONS" echo "##vso[task.setvariable variable=BUILD_OPTIONS]$BUILD_OPTIONS" diff --git a/.azure-pipelines/official-build-cache.yml b/.azure-pipelines/official-build-cache.yml index 4019dbba4f..94fd48ede5 100644 --- a/.azure-pipelines/official-build-cache.yml +++ b/.azure-pipelines/official-build-cache.yml @@ -37,3 +37,8 @@ stages: variables: docker_syncd_rpc_image: yes platform_rpc: mlnx + - name: marvell-armhf + pool: sonicbld-armhf + timeoutInMinutes: 1200 + variables: + PLATFORM_ARCH: armhf diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0932bee9c0..b3aa563307 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -31,25 +31,41 @@ resources: name: Azure/sonic-mgmt endpoint: build +variables: +- template: .azure-pipelines/azure-pipelines-repd-build-variables.yml +- name: CACHE_MODE + value: rcache + stages: -- stage: Build +- stage: BuildVS pool: sonicbld - variables: - - template: .azure-pipelines/azure-pipelines-repd-build-variables.yml - - name: CACHE_MODE - value: rcache jobs: - template: .azure-pipelines/azure-pipelines-build.yml parameters: buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) ${{ variables.VERSION_CONTROL_OPTIONS }}' jobGroups: - name: vs + +- stage: Build + pool: sonicbld + dependsOn: [] + jobs: + - template: .azure-pipelines/azure-pipelines-build.yml + parameters: + buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) ${{ variables.VERSION_CONTROL_OPTIONS }}' + jobGroups: - name: broadcom variables: swi_image: yes - name: mellanox + - name: marvell-armhf + pool: sonicbld-armhf + timeoutInMinutes: 1200 + variables: + PLATFORM_ARCH: armhf - stage: Test + dependsOn: BuildVS variables: - name: inventory value: veos_vtb