[ci] Fix the wrong build options issue (#7287)

Why I did it
Fix the wrong build options and improve display name for some tasks
1. Fix the wrong build architecture for arm64 and armhf
2. Fix the build timeout parameter
This commit is contained in:
xumia 2021-04-12 07:43:06 +08:00 committed by GitHub
parent e30a7eb6aa
commit 7df4c0ad7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions

View File

@ -50,9 +50,9 @@ jobs:
platform_rpc: centec platform_rpc: centec
- name: centec-arm64 - name: centec-arm64
pool: sonicbld_8c pool: sonicbld_8c
variables:
arch: arm64
timeoutInMinutes: 1800 timeoutInMinutes: 1800
variables:
PLATFORM_ARCH: arm64
- name: generic - name: generic
variables: variables:
dbg_image: true dbg_image: true
@ -61,9 +61,9 @@ jobs:
swi_image: true swi_image: true
- name: marvell-armhf - name: marvell-armhf
pool: sonicbld_8c pool: sonicbld_8c
variables:
arch: armhf
timeoutInMinutes: 1800 timeoutInMinutes: 1800
variables:
PLATFORM_ARCH: armhf
- name: mellanox - name: mellanox
variables: variables:
dbg_image: true dbg_image: true
@ -97,3 +97,4 @@ jobs:
fi fi
make $BUILD_OPTIONS target/sonic-$(GROUP_NAME).bin make $BUILD_OPTIONS target/sonic-$(GROUP_NAME).bin
fi fi
displayName: "Build sonic image"

View File

@ -33,7 +33,7 @@ jobs:
BUILD_OPTIONS="$(BUILD_OPTIONS) $CACHE_OPTIONS" BUILD_OPTIONS="$(BUILD_OPTIONS) $CACHE_OPTIONS"
echo "##vso[task.setvariable variable=BUILD_OPTIONS]$BUILD_OPTIONS" echo "##vso[task.setvariable variable=BUILD_OPTIONS]$BUILD_OPTIONS"
fi fi
displayName: "Make build options" displayName: "Set cache options"
- checkout: self - checkout: self
submodules: recursive submodules: recursive
displayName: 'Checkout code' displayName: 'Checkout code'