From 8b05b859e8aac088990f4694a0aef37428adcc9f Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jukotali@microsoft.com>
Date: Fri, 19 Oct 2018 10:18:11 -0700
Subject: [PATCH] Fix jenkins filename and add VSTS test runs (#1537)

---
 .vsts-pipelines/templates/build-steps.yml     | 43 ++++++++++++++++++-
 build/buildpipeline/pipeline.groovy           |  2 -
 build/buildpipeline/windows-staticshim.groovy | 15 -------
 3 files changed, 42 insertions(+), 18 deletions(-)
 delete mode 100644 build/buildpipeline/windows-staticshim.groovy

diff --git a/.vsts-pipelines/templates/build-steps.yml b/.vsts-pipelines/templates/build-steps.yml
index 780a42a356..a1cd198773 100644
--- a/.vsts-pipelines/templates/build-steps.yml
+++ b/.vsts-pipelines/templates/build-steps.yml
@@ -2,7 +2,48 @@ phases:
 - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
   parameters:
     agentOs: Windows
-    buildArgs: /p:SkipIISBackwardsCompatibilityTests=true
+    phaseName: IIS_Express_Tests
+    buildArgs: /p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=true
+    beforeBuild:
+      - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; & ./tools/SetupTestEnvironment.ps1 Setup"
+        displayName: Prepare repo
+    afterBuild:
+      - powershell: "& ./tools/SetupTestEnvironment.ps1 Shutdown"
+        displayName: Stop AppVerifier
+        condition: always()
+      - task: PublishBuildArtifacts@1
+        displayName: Upload logs
+        condition: eq(variables['system.pullrequest.isfork'], false)
+        inputs:
+          artifactName: logs
+          artifactType: Container
+          pathtoPublish: artifacts/logs
+
+- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
+  parameters:
+    agentOs: Windows
+    phaseName: IIS_Tests
+    buildArgs: /p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISExpressTests=true
+    beforeBuild:
+      - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; & ./tools/SetupTestEnvironment.ps1 Setup"
+        displayName: Prepare repo
+    afterBuild:
+      - powershell: "& ./tools/SetupTestEnvironment.ps1 Shutdown"
+        displayName: Stop AppVerifier
+        condition: always()
+      - task: PublishBuildArtifacts@1
+        displayName: Upload logs
+        condition: eq(variables['system.pullrequest.isfork'], false)
+        inputs:
+          artifactName: logs
+          artifactType: Container
+          pathtoPublish: artifacts/logs
+
+- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
+  parameters:
+    agentOs: Windows
+    phaseName: IIS_BackCompat_Tests
+    buildArgs: /p:SkipIISTests=true /p:SkipIISExpressTests=true
     beforeBuild:
       - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; & ./tools/SetupTestEnvironment.ps1 Setup"
         displayName: Prepare repo
diff --git a/build/buildpipeline/pipeline.groovy b/build/buildpipeline/pipeline.groovy
index 7d4b4aef15..7ccbca0b2a 100644
--- a/build/buildpipeline/pipeline.groovy
+++ b/build/buildpipeline/pipeline.groovy
@@ -1,7 +1,6 @@
 import org.dotnet.ci.pipelines.Pipeline
 
 def windowsPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows.groovy')
-def windowBackwardsCompatibilityPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows-BackwardsCompatibility.groovy')
 
 def configurations = [
     'Debug',
@@ -16,5 +15,4 @@ configurations.each { configuration ->
 
     windowsPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", params)
     windowsPipeline.triggerPipelineOnGithubPush(params)
-    windowBackwardsCompatibilityPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", params)
 }
diff --git a/build/buildpipeline/windows-staticshim.groovy b/build/buildpipeline/windows-staticshim.groovy
deleted file mode 100644
index b6b81e2f0b..0000000000
--- a/build/buildpipeline/windows-staticshim.groovy
+++ /dev/null
@@ -1,15 +0,0 @@
-@Library('dotnet-ci') _
-
-// 'node' indicates to Jenkins that the enclosed block runs on a node that matches
-// the label 'windows-with-vs'
-simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') {
-    stage ('Checking out source') {
-        checkout scm
-        bat 'git submodule update --init --recursive'
-    }
-    stage ('Build') {
-        def logFolder = getLogFolder()
-        def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}'"
-        bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"${environment};&.\\tools\\SetupTestEnvironment.ps1 SetupDumps;&.\\tools\\update_schema.ps1;&.\\tools\\UpdateIISExpressCertificate.ps1;&.\\run.cmd -CI default-build /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:Configuration=${params.Configuration}\";"
-    }
-}