Run integration tests in separate Azure Pipeline jobs

Author: pascalberger

azure-pipelines.yml

@@ -10,26 +10,34 @@ pr:
 - hotfix/*
 
 jobs:
-- job: Windows
+# Build
+- job: Build
   pool:
     vmImage: 'windows-2022'
   steps:
-  - powershell: |
-      $ENV:CAKE_SKIP_GITVERSION=([string]::IsNullOrEmpty($ENV:SYSTEM_PULLREQUEST_PULLREQUESTID) -eq $False).ToString()
-      .\build.ps1 --target=Buildserver
-      exit $LASTEXITCODE
-    displayName: 'Cake Build'
-- job: macOS
+  - powershell: ./build.ps1
+    displayName: 'Build'
+  - publish: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
+    artifact: NuGet Package
+    displayName: 'Publish NuGet package as build artifact'
+# Integration Tests Windows Server 2019 (.NET Core tool)
+- job: Test_Windows_2019_DotNetCoreTool
+  displayName: Integration Tests Windows Server 2019 (.NET Core tool)
+  dependsOn: Build
   pool:
-    vmImage: 'macOS-11'
+    vmImage: 'windows-2019'
   steps:
-  - bash: |
-      ./build.sh --target=Buildserver
-    displayName: 'Cake Build'
-- job: Ubuntu
-  pool:
-    vmImage: 'ubuntu-18.04'
-  steps:
-  - bash: |
-      ./build.sh --target=Buildserver
-    displayName: 'Cake Build'
+  - download: current
+    artifact: NuGet Package
+    displayName: 'Download build artifact'
+  - task: CopyFiles@2
+    inputs:
+      sourceFolder: $(Pipeline.Workspace)/NuGet Package
+      targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
+    displayName: 'Copy build artifact for test run'
+  - powershell: ./build.ps1
+    workingDirectory: ./tests/script-runner/
+    displayName: 'Run integration tests'
+  - publish: $(Build.SourcesDirectory)/docs/templates
+    artifact: Integration Tests Windows Server 2019 (.NET Core tool)
+    displayName: 'Publish generated reports as build artifact'

recipe.cake

@@ -16,7 +16,6 @@ BuildParameters.SetParameters(
     appVeyorAccountName: "cakecontrib",
     shouldRunCoveralls: false, // Disabled because it's currently failing
     shouldGenerateDocumentation: false,
-    shouldRunIntegrationTests: true,
     integrationTestScriptPath: "./tests/integration/tests.cake");
 
 BuildParameters.PrintParameters(Context);
@@ -27,35 +26,6 @@ ToolSettings.SetToolSettings(
     testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
     testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");
 
-//*************************************************************************************************
-// Extensions
-//*************************************************************************************************
-
-Task("Prepare-Integration-Tests")
-    .IsDependentOn("Create-NuGet-Packages")
-    .Does<BuildVersion>((context, buildVersion) =>
-{
-    // Clean addin directory
-    var addinDir = MakeAbsolute(Directory("./tools/Addins/" + BuildParameters.RepositoryName));
-    if (DirectoryExists(addinDir))
-    {
-        DeleteDirectory(addinDir, new DeleteDirectorySettings {
-            Recursive = true,
-            Force = true
-        });
-    }
-
-    // Unzip package from current build into addin directory
-    var packagePath =
-        BuildParameters.Paths.Directories.NuGetPackages.CombineWithFilePath("Cake.Issues.GitRepository." + buildVersion.SemVersion + ".nupkg");
-    Unzip(packagePath, addinDir);
-});
-
-Task("Buildserver")
-  .IsDependentOn("Run-Integration-Tests");
-
-BuildParameters.Tasks.IntegrationTestTask.IsDependentOn("Prepare-Integration-Tests");
-
 //*************************************************************************************************
 // Execution
 //*************************************************************************************************

tests/script-runner/build.ps1

@@ -0,0 +1,15 @@
+$ErrorActionPreference = 'Stop'
+
+$SCRIPT_NAME = "tests.cake"
+
+Write-Host "Restoring .NET Core tools"
+dotnet tool restore
+if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+
+Write-Host "Bootstrapping Cake"
+dotnet cake $SCRIPT_NAME --bootstrap
+if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+
+Write-Host "Running Build"
+dotnet cake $SCRIPT_NAME @args
+if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }

tests/script-runner/build.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+SCRIPT_NAME="tests.cake"
+
+echo "Restoring .NET Core tools"
+dotnet tool restore
+
+echo "Bootstrapping Cake"
+dotnet cake $SCRIPT_NAME --bootstrap
+
+echo "Running Build"
+dotnet cake $SCRIPT_NAME "$@"

tests/script-runner/nuget.config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="Integration" value="../../BuildArtifacts/Packages/NuGet" />
+    <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+  <disabledPackageSources>
+     <clear />
+  </disabledPackageSources>
+</configuration>

tests/integration/testfiles/cake-contrib-small.png renamed to tests/script-runner/testfiles/cake-contrib-small.png

@@ -1,7 +1,7 @@
-#addin nuget:?package=Cake.Issues&prerelease
-#addin nuget:?package=Cake.Issues.Reporting&prerelease
-#addin nuget:?package=Cake.Issues.Reporting.Generic&prerelease
-#reference "../../tools/Addins/Cake.Issues.GitRepository/lib/netstandard2.0/Cake.Issues.GitRepository.dll"
+#addin Cake.Issues&prerelease
+#addin Cake.Issues.Reporting&prerelease
+#addin Cake.Issues.Reporting.Generic&prerelease
+#addin Cake.Issues.GitRepository&prerelease
 
 //////////////////////////////////////////////////
 // ARGUMENTS