matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[CI] Fix the wrong environment variable PLATFORM passing into the slave container issue (#7262)

Browse Source 
* fix

* fix
This commit is contained in:
Shilong Liu 2021-04-09 07:36:53 +08:00
parent 9cc3721150
commit a375b9b7a5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.azure-pipelines/azure-pipelines-build.yml
View File

@ -21,7 +21,7 @@ jobs:
preSteps: ${{ parameters.preSteps }} preSteps: ${{ parameters.preSteps }}
postSteps: ${{ parameters.postSteps }} postSteps: ${{ parameters.postSteps }}
jobVariables: jobVariables:
PLATFORM: $(GROUP_NAME) PLATFORM_AZP: $(GROUP_NAME)
PLATFORM_ARCH: amd64 PLATFORM_ARCH: amd64
BUILD_OPTIONS: ${{ parameters.buildOptions }} BUILD_OPTIONS: ${{ parameters.buildOptions }}
dbg_image: false dbg_image: false

6
.azure-pipelines/azure-pipelines-image-template.yml
View File

@ -28,8 +28,8 @@ jobs:
- template: cleanup.yml - template: cleanup.yml
- ${{ parameters. preSteps }} - ${{ parameters. preSteps }}
- script: | - script: |
if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM) | grep -E -q "^(vs|broadcom|mellanox)$"; then 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)" CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=$(CACHE_MODE) SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/$(PLATFORM_AZP)"
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
@ -42,7 +42,7 @@ jobs:
sudo apt-get install -y acl sudo apt-get install -y acl
export DOCKER_DATA_ROOT_FOR_MULTIARCH=/data/march/docker export DOCKER_DATA_ROOT_FOR_MULTIARCH=/data/march/docker
sudo bash -c "echo 1 > /proc/sys/vm/compact_memory" 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' displayName: 'Make configure'
postSteps: postSteps:
- publish: $(System.DefaultWorkingDirectory)/target - publish: $(System.DefaultWorkingDirectory)/target