Integrate latest eng/common changes (dotnet#176)

Author: mthalman

eng/common/Invoke-CleanupDocker.ps1

@@ -5,11 +5,17 @@ docker ps -a -q | ForEach-Object { docker rm -f $_ }
 
 docker volume prune -f
 
-# Windows base images are large, preserve them to avoid the overhead of pulling each time.
-docker images |
+# Preserve the Windows base images and the common eng infra images (e.g. ImageBuilder)
+# to avoid the expense of having to repull continuously.
+$engInfraImages = Get-Content ./eng/common/templates/variables/docker-images.yml |
+    Where-Object { $_.Trim() -notlike 'variables:' } |
+    ForEach-Object { $_.Split(' ', [System.StringSplitOptions]::RemoveEmptyEntries)[1] }
+
+docker images --format "{{.Repository}}:{{.Tag}} {{.ID}}"|
     Where-Object {
-        -Not ($_.StartsWith("mcr.microsoft.com/windows")`
-        -Or $_.StartsWith("REPOSITORY ")) } |
-    ForEach-Object { $_.Split(' ', [System.StringSplitOptions]::RemoveEmptyEntries)[2] } |
+        $localImage = $_
+        -Not ($localImage.StartsWith("mcr.microsoft.com/windows")`
+            -Or ($engInfraImages.Where({ $localImage.StartsWith($_) }, 'First').Count -gt 0)) } |
+    ForEach-Object { $_.Split(' ', [System.StringSplitOptions]::RemoveEmptyEntries)[1] } |
     Select-Object -Unique |
     ForEach-Object { docker rmi -f $_ }

eng/common/Invoke-ReadmeGeneration.ps1

@@ -3,8 +3,8 @@ param (
     [string] $Repo,
     [string] $ReadmePath,
     [string] $Manifest,
-    [string] $Branch,
     [string] $GitRepo,
+    [string] $Branch = "master",
     [switch] $ReuseImageBuilderImage
 )
 

eng/common/build-and-test.ps1

@@ -4,23 +4,47 @@ param(
     [string]$VersionFilter = "*",
     [string]$OSFilter = "*",
     [string]$ArchitectureFilter = "amd64",
-    [string]$ImageBuilderCustomArgs,
-    [switch]$SkipTesting = $false
+    [string]$OptionalImageBuilderArgs,
+    [string]$OptionalTestArgs,
+    [switch]$SkipTesting = $false,
+    [switch]$ExcludeArchitecture = $false
 )
 
 Set-StrictMode -Version Latest
 $ErrorActionPreference = 'Stop'
 
+function Log {
+    param ([string] $Message)
+
+    Write-Output $Message
+}
+
+function Exec {
+    param ([string] $Cmd)
+
+    Log "Executing: '$Cmd'"
+    Invoke-Expression $Cmd
+    if ($LASTEXITCODE -ne 0) {
+        throw "Failed: '$Cmd'"
+    }
+}
+
 pushd $PSScriptRoot/../..
 try {
-    ./eng/common/Invoke-ImageBuilder.ps1 "build --path '$VersionFilter/*/$OSFilter/$ArchitectureFilter' $ImageBuilderCustomArgs"
+    $pathFilter = "$VersionFilter/*/$OSFilter"
+    if (-not $ExcludeArchitecture) {
+        $pathFilter += "/$ArchitectureFilter"
+    }
+
+    ./eng/common/Invoke-ImageBuilder.ps1 "build --path '$pathFilter' $OptionalImageBuilderArgs"
 
     if (-not $SkipTesting) {
         if (Test-Path ./tests/run-tests.ps1) {
-            ./tests/run-tests.ps1 `
-                -VersionFilter $VersionFilter `
-                -ArchitectureFilter $ArchitectureFilter `
-                -OSFilter $OSFilter -IsLocalRun
+            if (-not $ExcludeArchitecture) {
+                $OptionalTestArgs += " -ArchitectureFilter $ArchitectureFilter"
+            }
+
+            Exec "./tests/run-tests.ps1 -VersionFilter $VersionFilter -OSFilter $OSFilter $OptionalTestArgs"
         } else {
           Write-Warning "Test script file './tests/run-tests.ps1' not found."
         }

eng/common/readme.md

@@ -25,4 +25,4 @@
 
 !!! Changes made in this directory are subject to being overwritten by automation !!!
 
-The files in this directory are shared by all .NET Docker repos. If you need to make changes to these files, open an issue.
+The files in this directory are shared by all .NET Docker repos. If you need to make changes to these files, open an issue or submit a pull request in https://github.com/dotnet/docker-tools.

eng/common/templates/steps/test-images-linux-client.yml

@@ -70,7 +70,7 @@ steps:
     searchFolder: $(Common.TestResultsDirectory)
     mergeTestResults: true
     publishRunAttachments: true
-    testRunTitle: Linux $(dotnetVersion) $(osVariant) $(architecture)
+    testRunTitle: $(dotnetVersion) $(osVariant) $(architecture)
 - script: docker rm -f $(testRunner.container)
   displayName: Cleanup TestRunner Container
   condition: always()

eng/common/templates/steps/test-images-windows-client.yml

@@ -11,6 +11,9 @@ steps:
     } else {
       $optionalTestArgs="-IsLocalRun"
     }
+    if ($env:REPOTESTARGS) {
+      $optionalTestArgs += " $env:REPOTESTARGS"
+    }
     echo "##vso[task.setvariable variable=optionalTestArgs]$optionalTestArgs"
   displayName: Set Test Variables
 - powershell: Get-ChildItem -Path tests -r | Where {$_.Extension -match "trx"} | Remove-Item
@@ -39,6 +42,6 @@ steps:
     testResultsFiles: 'tests/**/*.trx'
     mergeTestResults: true
     publishRunAttachments: true
-    testRunTitle: Windows $(dotnetVersion) $(osVariant) amd64
+    testRunTitle: $(dotnetVersion) $(osVariant) amd64
 - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
   - template: cleanup-docker-windows.yml

eng/common/templates/variables/docker-images.yml

@@ -1,6 +1,6 @@
 variables:
-  imageNames.imageBuilder.linux: mcr.microsoft.com/dotnet-buildtools/image-builder:debian-20190807123248
-  imageNames.imageBuilder.windows: mcr.microsoft.com/dotnet-buildtools/image-builder:nanoserver-20190807123248
+  imageNames.imageBuilder.linux: mcr.microsoft.com/dotnet-buildtools/image-builder:debian-20190809195217
+  imageNames.imageBuilder.windows: mcr.microsoft.com/dotnet-buildtools/image-builder:nanoserver-20190809195217
   imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
-  imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-docker-testrunner-63f2145-20184325094343
+  imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-slim-docker-testrunner-d61254f-20190807161111
   imageNames.testRunner.withrepo: testrunner-withrepo:$(Build.BuildId)-$(System.JobId)