Test running all steps in a container

ellahathaway · ellahathaway · commit 10e0e17b1d9a · 2024-11-20T20:03:19.000Z
diff --git a/src/sdk/eng/pipelines/templates/jobs/vmr-build.yml b/src/sdk/eng/pipelines/templates/jobs/vmr-build.yml
@@ -114,6 +114,8 @@ jobs:
 - job: ${{ parameters.buildName }}_${{ parameters.architecture }}${{ replace(format('_BuildPass{0}', coalesce(parameters.buildPass, '1')), '_BuildPass1', '') }}
   pool: ${{ parameters.pool }}
 
+  container: ${{ parameters.container }}
+
   # Currently, CodeQL slows the build down too much
   # https://github.com/dotnet/source-build/issues/4276
   ${{ if and(parameters.isBuiltFromVmr, startswith(parameters.buildName, 'Windows'), eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
@@ -332,7 +334,8 @@ jobs:
             echo "##vso[task.setvariable variable=additionalBuildArgs]--with-sdk /vmr/.dotnet"
           fi
 
-          docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }} ./prep-source-build.sh $customPrepArgs
+          cd $(sourcesPath)
+          ./prep-source-build.sh $customPrepArgs
         displayName: Prep the Build
 
     - script: |
@@ -402,31 +405,12 @@ jobs:
 
         buildArgs="$(additionalBuildArgs) $customBuildArgs $extraBuildProperties"
 
-        # Only use Docker when a container is specified
-        if [[ -n "${{ parameters.container }}" ]]; then
-          # Allows Arcade to have access to the commit for the build, pass it through to the container
-          customEnvVars="$customEnvVars BUILD_SOURCEVERSION=$BUILD_SOURCEVERSION"
-
-          customEnvVars="$customEnvVars BUILD_BUILDNUMBER=$(Build.BuildNumber)"
-
-          customDockerRunArgs=""
-          for envVar in $customEnvVars; do
-            customDockerRunArgs="$customDockerRunArgs -e $envVar"
-          done
-
-          if [[ '${{ parameters.runOnline }}' == 'False' ]]; then
-            customDockerRunArgs="$customDockerRunArgs --network none"
-          fi
-
-          docker run --rm -v "$(sourcesPath):/vmr" -w /vmr $customDockerRunArgs ${{ parameters.container }} ./build.sh $buildArgs
-        else
-          for envVar in $customEnvVars; do
-            customEnvVarsWithBashSyntax="$customEnvVarsWithBashSyntax export $envVar;"
-          done
-          cd $(sourcesPath)
-          eval $customEnvVarsWithBashSyntax
-          ./build.sh $buildArgs
-        fi
+        for envVar in $customEnvVars; do
+          customEnvVarsWithBashSyntax="$customEnvVarsWithBashSyntax export $envVar;"
+        done
+        cd $(sourcesPath)
+        eval $customEnvVarsWithBashSyntax
+        ./build.sh $buildArgs
       displayName: Build
 
     # Only run tests if enabled
@@ -481,13 +465,8 @@ jobs:
             extraBuildProperties="$extraBuildProperties ${{ parameters.extraProperties }}"
           fi
 
-          # Only use Docker when a container is specified
-          if [[ -n "${{ parameters.container }}" ]]; then
-            docker run --rm $dockerVolumeArgs -w /vmr ${{ parameters.container }} ./build.sh --test --excludeCIBinarylog /bl:artifacts/log/Release/Test.binlog $customBuildArgs $extraBuildProperties $(additionalBuildArgs)
-          else
-            cd $(sourcesPath)
-            ./build.sh --test --excludeCIBinarylog /bl:artifacts/log/Release/Test.binlog $customBuildArgs $extraBuildProperties $(additionalBuildArgs)
-          fi
+          cd $(sourcesPath)
+          ./build.sh --test --excludeCIBinarylog /bl:artifacts/log/Release/Test.binlog $customBuildArgs $extraBuildProperties $(additionalBuildArgs)
 
         displayName: Run Tests
         timeoutInMinutes: ${{ variables.runTestsTimeout }}
@@ -536,12 +515,6 @@ jobs:
         targetFolder=$(Build.StagingDirectory)/BuildLogs/
         mkdir -p ${targetFolder}
 
-        # Download rsync if using mariner
-        if grep -qE "CBL-Mariner|Azure Linux" /etc/os-release; then
-          sudo tdnf install -y rsync
-          sudo tdnf clean all
-        fi
-
         cd "$(sourcesPath)"
 
         find artifacts/log/ -exec rsync -R {} -t ${targetFolder} \;
