Add test script for Image Builder (#567)

Author: mthalman

.gitignore

@@ -13,3 +13,9 @@
 
 # ImageBuilder directory
 .Microsoft.DotNet.ImageBuilder
+
+# dotnet install directory
+.dotnet/
+
+# Test files
+*.trx

eng/common/Install-DotNetSdk.ps1

@@ -0,0 +1,48 @@
+#!/usr/bin/env pwsh
+#
+# Copyright (c) .NET Foundation and contributors. All rights reserved.
+# Licensed under the MIT license. See LICENSE file in the project root for full license information.
+#
+
+<#
+.SYNOPSIS
+Install the .NET Core SDK at the specified path.
+
+.PARAMETER InstallPath
+The path where the .NET Core SDK is to be installed.
+
+#>
+[cmdletbinding()]
+param(
+    [string]
+    $InstallPath
+)
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+
+if (!(Test-Path "$InstallPath")) {
+    mkdir "$InstallPath" | Out-Null
+}
+
+$IsRunningOnUnix = $PSVersionTable.contains("Platform") -and $PSVersionTable.Platform -eq "Unix"
+if ($IsRunningOnUnix) {
+    $DotnetInstallScript = "dotnet-install.sh"
+}
+else {
+    $DotnetInstallScript = "dotnet-install.ps1"
+}
+
+if (!(Test-Path $DotnetInstallScript)) {
+    Invoke-WebRequest "https://dot.net/v1/$DotnetInstallScript" -OutFile $InstallPath/$DotnetInstallScript
+}
+
+if ($IsRunningOnUnix) {
+    & chmod +x $InstallPath/$DotnetInstallScript
+    & $InstallPath/$DotnetInstallScript --channel "3.1" --version "latest" --install-dir $InstallPath
+}
+else {
+    & $InstallPath/$DotnetInstallScript -Channel "3.1" -Version "latest" -InstallDir $InstallPath
+}
+
+if ($LASTEXITCODE -ne 0) { throw "Failed to install the .NET Core SDK" }

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

@@ -39,7 +39,7 @@ steps:
   continueOnError: true
   inputs:
     testRunner: vSTest
-    testResultsFiles: 'tests/**/*.trx'
+    testResultsFiles: '$(testResultsDirectory)/**/*.trx'
     mergeTestResults: true
     publishRunAttachments: true
     testRunTitle: $(dotnetVersion) $(osVariant) amd64

eng/pipelines/dotnet-docker-tools-eng-validation.yml

@@ -18,11 +18,11 @@ trigger:
 variables:
 - template: ../common/templates/variables/common.yml
 - name: manifest
-  value: test/pipeline-validation/test-manifest.json
+  value: eng/tests/pipeline-validation/test-manifest.json
 - name: testScriptPath
-  value: ./test/pipeline-validation/run-tests.ps1
+  value: ./eng/tests/pipeline-validation/run-tests.ps1
 - name: testResultsDirectory
-  value: test/pipeline-validation/TestResults/
+  value: eng/tests/pipeline-validation/TestResults/
 - name: publicGitRepoUri
   value: https://github.com/dotnet/dotnet-docker-test
 - name: publishRepoPrefix

eng/pipelines/templates/variables/image-builder.yml

@@ -8,3 +8,7 @@ variables:
   value: --var UniqueId=$(sourceBuildId)
 - name: imageInfoVariant
   value: "-imagebuilder"
+- name: testScriptPath
+  value: ./src/Microsoft.DotNet.ImageBuilder/run-tests.ps1
+- name: testResultsDirectory
+  value: src/Microsoft.DotNet.ImageBuilder/tests/TestResults/

test/pipeline-validation/1.0/focal/amd64/Dockerfile eng/tests/pipeline-validation/1.0/focal/amd64/Dockerfile

@@ -12,16 +12,12 @@ ARG RID_ARCH=x64
 WORKDIR /image-builder
 
 # restore packages before copying entire source - provides optimizations when rebuilding
-COPY Microsoft.DotNet.ImageBuilder.sln ./
 COPY NuGet.config ./
 COPY src/Microsoft.DotNet.ImageBuilder.csproj ./src/
-COPY tests/Microsoft.DotNet.ImageBuilder.Tests.csproj ./tests/
-RUN dotnet restore Microsoft.DotNet.ImageBuilder.sln
+RUN dotnet restore ./src/Microsoft.DotNet.ImageBuilder.csproj
 
-# copy everything else and build
+# copy everything else and publish
 COPY . ./
-RUN dotnet build Microsoft.DotNet.ImageBuilder.sln
-RUN dotnet test tests/Microsoft.DotNet.ImageBuilder.Tests.csproj
 RUN dotnet publish ./src/Microsoft.DotNet.ImageBuilder.csproj -c Release -o out -r linux-musl-$RID_ARCH /p:ShowLinkerSizeComparison=true
 
 

test/pipeline-validation/1.0/focal/arm64v8/Dockerfile eng/tests/pipeline-validation/1.0/focal/arm64v8/Dockerfile

@@ -3,21 +3,12 @@ FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-env
 WORKDIR /image-builder
 
 # restore packages before copying entire source - provides optimizations when rebuilding
-COPY Microsoft.DotNet.ImageBuilder.sln ./
 COPY NuGet.config ./
 COPY src/Microsoft.DotNet.ImageBuilder.csproj ./src/
-COPY tests/Microsoft.DotNet.ImageBuilder.Tests.csproj ./tests/
-RUN dotnet restore Microsoft.DotNet.ImageBuilder.sln
+RUN dotnet restore ./src/Microsoft.DotNet.ImageBuilder.csproj
 
-# copy everything else and build
+# copy everything else and publish
 COPY . ./
-RUN dotnet build Microsoft.DotNet.ImageBuilder.sln
-
-# Workaround:  Tests rely on Path.GetTempPath which isn't compatible with the default ContainerUser.
-USER ContainerAdministrator
-RUN dotnet test tests/Microsoft.DotNet.ImageBuilder.Tests.csproj
-USER ContainerUser
-
 RUN dotnet publish ./src/Microsoft.DotNet.ImageBuilder.csproj -c Release -o out -r win7-x64
 
 

test/pipeline-validation/1.0/nanoserver-1809/amd64/Dockerfile eng/tests/pipeline-validation/1.0/nanoserver-1809/amd64/Dockerfile

@@ -0,0 +1,27 @@
+#!/usr/bin/env pwsh
+#
+# Copyright (c) .NET Foundation and contributors. All rights reserved.
+# Licensed under the MIT license. See LICENSE file in the project root for full license information.
+#
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+
+$dotnetInstallDir = "$PSScriptRoot/../../.dotnet"
+
+Push-Location $PSScriptRoot
+
+try {
+    & ../../eng/common/Install-DotNetSdk.ps1 $dotnetInstallDir
+
+    $cmd = "$DotnetInstallDir/dotnet test --logger:trx"
+
+    Write-Output "Executing '$cmd'"
+    Invoke-Expression $cmd
+    if ($LASTEXITCODE -ne 0) {
+        throw "Failed: '$cmd'"
+    }
+}
+finally {
+    Pop-Location
+}