Remove azcopy logs, hardcoded /Users/vcpkg. (#51078)

This commit is contained in:
Billy O'Neal 2026-04-09 13:06:25 -07:00 committed by GitHub
parent baababd134
commit 80a18bee6a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 5 additions and 40 deletions

View File

@ -109,12 +109,6 @@ jobs:
targetPath: '$(WORKING_ROOT)/failure-logs'
artifact: "failure logs for ${{ replace(parameters.jobName, '_', '-') }}"
condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True')
- task: PublishPipelineArtifact@1
displayName: "Publish Artifact: azcopy logs for ${{ replace(parameters.jobName, '_', '-') }}"
inputs:
targetPath: '$(WORKING_ROOT)/azcopy-logs'
artifactName: "z azcopy logs for ${{ replace(parameters.jobName, '_', '-') }}"
condition: ne(variables['AZCOPY_LOGS_EMPTY'], 'True')
- task: UseNode@1
displayName: 'Ensure Node.js is available'
condition: always()

View File

@ -109,12 +109,6 @@ jobs:
targetPath: '$(WORKING_ROOT)/failure-logs'
artifact: "failure logs for ${{ replace(parameters.jobName, '_', '-') }}"
condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True')
- task: PublishPipelineArtifact@1
displayName: "Publish Artifact: azcopy logs for ${{ replace(parameters.jobName, '_', '-') }}"
inputs:
targetPath: '$(WORKING_ROOT)/azcopy-logs'
artifactName: "z azcopy logs for ${{ replace(parameters.jobName, '_', '-') }}"
condition: ne(variables['AZCOPY_LOGS_EMPTY'], 'True')
- task: UseNode@1
displayName: 'Ensure Node.js is available'
condition: always()

View File

@ -23,18 +23,12 @@ jobs:
workspace:
clean: resources
timeoutInMinutes: 2880 # 2 days
variables:
- name: WORKING_ROOT
value: /Users/vcpkg/Data
- name: VCPKG_DOWNLOADS
value: /Users/vcpkg/Data/downloads
steps:
- bash: |
sudo mdutil -ad || 0
sudo mkdir ${{ variables.VCPKG_DOWNLOADS }} || 0
sudo chmod 777 ${{ variables.VCPKG_DOWNLOADS }} || 0
sudo mkdir -p ~/Data/downloads || 0
sudo chmod 777 ~/Data/downloads || 0
exit 0
displayName: 'Create ${{ variables.VCPKG_DOWNLOADS }}'
displayName: 'Create ~/Data/downloads'
- bash: ./bootstrap-vcpkg.sh
displayName: 'Bootstrap vcpkg'
condition: eq('use default', '${{ parameters.vcpkgToolSha }}')
@ -60,19 +54,13 @@ jobs:
# Persist the binary SAS as a secret pipeline variable for the owners-db step
Write-Host "##vso[task.setvariable variable=BCACHE_SAS_TOKEN;issecret=true]$binarySas"
$env:X_VCPKG_ASSET_SOURCES = "x-azurl,https://vcpkgassetcachewus.blob.core.windows.net/cache,$assetSas,readwrite"
& scripts/azure-pipelines/test-modified-ports.ps1 -Triplet ${{ replace(parameters.jobName, '_', '-') }} -BuildReason $(Build.Reason) -BinarySourceStub "x-azcopy-sas,https://vcpkgbinarycachewus.blob.core.windows.net/cache,$binarySas" -WorkingRoot $env:WORKING_ROOT -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)
& scripts/azure-pipelines/test-modified-ports.ps1 -Triplet ${{ replace(parameters.jobName, '_', '-') }} -BuildReason $(Build.Reason) -BinarySourceStub "x-azcopy-sas,https://vcpkgbinarycachewus.blob.core.windows.net/cache,$binarySas" -WorkingRoot "$HOME/Data" -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)
- task: PublishPipelineArtifact@1
displayName: "Publish Artifact: failure logs for ${{ replace(parameters.jobName, '_', '-') }}"
inputs:
targetPath: '$(Build.ArtifactStagingDirectory)/failure-logs'
artifact: "failure logs for ${{ replace(parameters.jobName, '_', '-') }}"
condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True')
- task: PublishPipelineArtifact@1
displayName: "Publish Artifact: azcopy logs for ${{ replace(parameters.jobName, '_', '-') }}"
inputs:
targetPath: '$(WORKING_ROOT)/azcopy-logs'
artifactName: "z azcopy logs for ${{ replace(parameters.jobName, '_', '-') }}"
condition: ne(variables['AZCOPY_LOGS_EMPTY'], 'True')
- task: UseNode@1
displayName: 'Ensure Node.js is available'
inputs:
@ -86,7 +74,7 @@ jobs:
npx --yes ts-node ./file_script_from_cache.ts --pr-hashes "$(Build.ArtifactStagingDirectory)/pr-hashes.json" --blob-base-url "$blob" --target-branch "origin/master" --out-dir ../../list_files
else
echo "Running file_script for CI"
npx --yes ts-node ./file_script.ts --info-dir /Users/vcpkg/Data/installed/vcpkg/info/ --out-dir ../../list_files
npx --yes ts-node ./file_script.ts --info-dir ~/Data/installed/vcpkg/info/ --out-dir ../../list_files
fi
displayName: 'Build a file list for all packages'
condition: always()

View File

@ -96,7 +96,6 @@ if (!(Test-Path $env:AZCOPY_LOG_LOCATION))
New-Item -ItemType Directory -Path $env:AZCOPY_LOG_LOCATION | Out-Null
}
Write-Host "AzCopy logs location: $env:AZCOPY_LOG_LOCATION"
Write-Host "##vso[task.setvariable variable=AZCOPY_LOGS_EMPTY]$true"
$commonArgs = @(
"--x-buildtrees-root=$buildtreesRoot",
@ -160,8 +159,6 @@ if ($testFeatures) {
$failingAbiLogArg = "--failing-abi-log=$knownFailingAbisFile"
& $vcpkgExe x-test-features --for-merge-with origin/master $tripletArg $failureLogsArg $ciBaselineArg $failingAbiLogArg $ciFeatureBaselineArg @commonArgs @cachingArgs
$lastLastExitCode = $LASTEXITCODE
$azcopyLogsEmpty = ((Get-ChildItem $env:AZCOPY_LOG_LOCATION).Count -eq 0)
Write-Host "##vso[task.setvariable variable=AZCOPY_LOGS_EMPTY]$azcopyLogsEmpty"
if ($lastLastExitCode -ne 0)
{
Write-Host "##vso[task.setvariable variable=FAILURE_LOGS_EMPTY]$false"
@ -265,8 +262,6 @@ $prHashesFile = Join-Path $ArtifactStagingDirectory "pr-hashes.json"
$lastLastExitCode = $LASTEXITCODE
$failureLogsEmpty = (-Not (Test-Path $failureLogs) -Or ((Get-ChildItem $failureLogs).Count -eq 0))
Write-Host "##vso[task.setvariable variable=FAILURE_LOGS_EMPTY]$failureLogsEmpty"
$azcopyLogsEmpty = ((Get-ChildItem $env:AZCOPY_LOG_LOCATION).Count -eq 0)
Write-Host "##vso[task.setvariable variable=AZCOPY_LOGS_EMPTY]$azcopyLogsEmpty"
Write-Host "##vso[task.setvariable variable=XML_RESULTS_FILE]$xunitFile"
if ($lastLastExitCode -ne 0)

View File

@ -89,12 +89,6 @@ jobs:
targetPath: '$(Build.ArtifactStagingDirectory)\failure-logs'
artifact: "failure logs for ${{ replace(parameters.jobName, '_', '-') }}"
condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True')
- task: PublishPipelineArtifact@1
displayName: "Publish Artifact: azcopy logs for ${{ replace(parameters.jobName, '_', '-') }}"
inputs:
targetPath: '$(WORKING_ROOT)/azcopy-logs'
artifactName: "z azcopy logs for ${{ replace(parameters.jobName, '_', '-') }}"
condition: ne(variables['AZCOPY_LOGS_EMPTY'], 'True')
- task: UseNode@1
displayName: 'Ensure Node.js is available'
condition: always()