[CI] Fix the wrong environment variable PLATFORM passing into the slave container issue (#7262)
* fix * fix
This commit is contained in:
parent
2f794be816
commit
9ffc5466d0
@ -21,7 +21,7 @@ jobs:
|
||||
preSteps: ${{ parameters.preSteps }}
|
||||
postSteps: ${{ parameters.postSteps }}
|
||||
jobVariables:
|
||||
PLATFORM: $(GROUP_NAME)
|
||||
PLATFORM_AZP: $(GROUP_NAME)
|
||||
PLATFORM_ARCH: amd64
|
||||
BUILD_OPTIONS: ${{ parameters.buildOptions }}
|
||||
dbg_image: false
|
||||
|
@ -28,8 +28,8 @@ jobs:
|
||||
- template: cleanup.yml
|
||||
- ${{ parameters. preSteps }}
|
||||
- script: |
|
||||
if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM) | grep -E -q "^(vs|broadcom|mellanox)$"; then
|
||||
CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=$(CACHE_MODE) SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/$(PLATFORM)"
|
||||
if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox)$"; 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"
|
||||
fi
|
||||
@ -42,7 +42,7 @@ jobs:
|
||||
sudo apt-get install -y acl
|
||||
export DOCKER_DATA_ROOT_FOR_MULTIARCH=/data/march/docker
|
||||
sudo bash -c "echo 1 > /proc/sys/vm/compact_memory"
|
||||
ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$(PLATFORM) PLATFORM_ARCH=$(PLATFORM_ARCH) configure
|
||||
ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$(PLATFORM_AZP) PLATFORM_ARCH=$(PLATFORM_ARCH) configure
|
||||
displayName: 'Make configure'
|
||||
postSteps:
|
||||
- publish: $(System.DefaultWorkingDirectory)/target
|
||||
|
Loading…
Reference in New Issue
Block a user