[vcpkg] Allow CI to pass in all relevant directories and remove use of symbolic links (#11483)

2 files changed, 11 insertions, 21 deletions

diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml
index 022fc70e4..fc0977697 100644
--- a/scripts/azure-pipelines/linux/azure-pipelines.yml
+++ b/scripts/azure-pipelines/linux/azure-pipelines.yml
@@ -10,28 +10,26 @@ jobs:
     clean: resources

   timeoutInMinutes: 1440 # 1 day

   steps:

-  - bash: |

-      df -h

-    displayName: 'Report on Disk Space Before Environment'

-    condition: always()

-  - task: Bash@3

-    displayName: 'Initialize Environment'

-    inputs:

-      filePath: scripts/azure-pipelines/linux/initialize-environment.sh

+  - bash: df -h

+    displayName: 'Report on Disk Space'

   - bash: |

       sudo mkdir /home/agent -m=777

       sudo chown `id -u` /home/agent

       exit 0

     displayName: 'Create /home/agent'

+    # Note: /mnt is the Azure machines' temporary disk.

   - bash: |

-      df -h

-    displayName: 'Report on Disk Space After Environment'

-    condition: always()

+      sudo mkdir /mnt/vcpkg-ci -m=777

+      sudo mkdir /mnt/vcpkg-ci/downloads -m=777

+      exit 0

+    displayName: 'Create /mnt/vcpkg-ci/downloads'

   - task: Bash@3

     displayName: 'Build vcpkg'

     inputs:

       filePath: bootstrap-vcpkg.sh

       arguments: "-buildTests"

+    env:

+      VCPKG_DOWNLOADS: '/mnt/vcpkg-ci/downloads'

   - bash: toolsrc/build.rel/vcpkg-test

     displayName: 'Run vcpkg tests'

   - powershell: |

@@ -39,14 +37,14 @@ jobs:
       $skipList = ./scripts/azure-pipelines/generate-skip-list.ps1 -Triplet "x64-linux" -BaselineFile "$(System.DefaultWorkingDirectory)/scripts/ci.baseline.txt"

       mkdir $(System.ArtifactsDirectory)/xml-results

       $env:HOME = '/home/agent'

-      ./vcpkg ci x64-linux --x-xunit="$(System.ArtifactsDirectory)/xml-results/x64-linux.xml" --exclude=$skipList --binarycaching

+      ./vcpkg ci x64-linux --x-xunit="$(System.ArtifactsDirectory)/xml-results/x64-linux.xml" --exclude=$skipList --binarycaching --x-binarysource=clear`;files`,/archives`,upload --x-buildtrees-root=/mnt/vcpkg-ci/buildtrees --x-install-root=/mnt/vcpkg-ci/install --x-packages-root=/mnt/vcpkg-ci/packages --downloads-root=/mnt/vcpkg-ci/downloads

     displayName: '** Test Modified Ports **'

   - task: PowerShell@2

     displayName: 'Analyze results and prepare test logs'

     inputs:

       failOnStderr: true

       filePath: 'scripts/azure-pipelines/analyze-test-results.ps1'

-      arguments: '-baselineFile $(System.DefaultWorkingDirectory)/scripts/ci.baseline.txt -logDir "$(System.ArtifactsDirectory)/xml-results" -outputDir "$(Build.ArtifactStagingDirectory)" -failurelogDir "archives/fail" -triplets "x64-linux" -errorOnRegression'

+      arguments: '-baselineFile $(System.DefaultWorkingDirectory)/scripts/ci.baseline.txt -logDir "$(System.ArtifactsDirectory)/xml-results" -outputDir "$(Build.ArtifactStagingDirectory)" -failurelogDir "/archives/fail" -triplets "x64-linux" -errorOnRegression'

   - bash: |

       df -h

     displayName: 'Report on Disk Space After Build'

diff --git a/scripts/azure-pipelines/linux/initialize-environment.sh b/scripts/azure-pipelines/linux/initialize-environment.sh
deleted file mode 100755
index 1cbdd3326..000000000
--- a/scripts/azure-pipelines/linux/initialize-environment.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# Copyright (c) Microsoft Corporation.
-# SPDX-License-Identifier: MIT
-
-# Cleans up the environment to prevent contamination across builds.
-if [ ! -d "archives" ]; then
-    ln -s /archives archives
-fi