update build YAML for v1.3 (#4296)

* update build YAML for v1.3 * update build system to run incrementally * added missing MNTR template * pass in targetBranch=v1.3 via build system
akkadotnet · Mar 5, 2020 · 5542210 · 5542210
1 parent 546a5a0
commit 5542210
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 36 deletions.
diff --git a/build-system/azure-pipeline.mntr-template.yaml b/build-system/azure-pipeline.mntr-template.yaml
@@ -0,0 +1,66 @@
+parameters:
+  name: ''
+  displayName: ''
+  vmImage: ''
+  dependsOn: 'WindowsBuild'
+  artifactName: 'akkaBuild'
+  scriptFileName: ''
+  scriptArgs: 'all'
+  outputDirectory: ''
+  timeoutInMinutes: 120
+
+jobs:
+  - job: ${{ parameters.name }}
+    displayName: ${{ parameters.displayName }}
+    timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
+    pool:
+      vmImage: ${{ parameters.vmImage }}
+    steps:
+      - task: Bash@3 
+        displayName: Linux / OSX Build
+        inputs:
+          filePath: ${{ parameters.scriptFileName }}
+          arguments: ${{ parameters.scriptArgs }}
+        continueOnError: true
+        condition: in( variables['Agent.OS'], 'Linux', 'Darwin' )
+      # Windows
+      - task: BatchScript@1
+        displayName: Windows Build
+        inputs:
+          filename: ${{ parameters.scriptFileName }}
+          arguments: ${{ parameters.scriptArgs }}
+        continueOnError: true
+        condition: eq( variables['Agent.OS'], 'Windows_NT' )
+      - task: PublishTestResults@2
+        inputs:
+          testRunner: VSTest
+          testResultsFiles: '**/*.trx' #TestResults folder usually
+          testRunTitle: ${{ parameters.name }}
+          mergeTestResults: true
+      - task: CopyFiles@2
+        displayName: 'Copy Build Output'
+        inputs:
+          sourceFolder: ${{ parameters.outputDirectory }}
+          contents: '**\*'
+          targetFolder: $(Build.ArtifactStagingDirectory)
+          continueOnError: boolean  # 'true' if future steps should run even if this step fails; defaults to 'false'
+      - task: PublishBuildArtifacts@1
+        inputs:
+          pathtoPublish: '$(Build.ArtifactStagingDirectory)'
+          artifactName: ${{ parameters.artifactName }}
+      - task: CopyFiles@2
+        displayName: 'Copy MNTR Failure Logs'
+        inputs:
+          sourceFolder: ${{ parameters.mntrFailuresDir }}
+          contents: 'FAILED_SPECS_LOGS\*'
+          cleanTargetFolder: true
+          targetFolder: $(Build.ArtifactStagingDirectory)
+          continueOnError: boolean  # 'true' if future steps should run even if this step fails; defaults to 'false'
+      - task: PublishBuildArtifacts@1
+        inputs:
+          pathtoPublish: '$(Build.ArtifactStagingDirectory)'
+          artifactName: ${{ parameters.mntrFailuresArtifactName }}
+      - script: 'echo 1>&2'
+        failOnStderr: true
+        displayName: 'If above is partially succeeded, then fail'
+        condition: eq(variables['Agent.JobStatus'], 'SucceededWithIssues')
diff --git a/build-system/linux-pr-validation.yaml b/build-system/linux-pr-validation.yaml
diff --git a/build-system/pr-validation.yaml b/build-system/pr-validation.yaml
@@ -4,13 +4,13 @@ trigger:
   branches:
     include:
       - dev
-      - test-dev
+      - v1.*
       - master
 
 pr:
   autoCancel: true # indicates whether additional pushes to a PR should cancel in-progress runs for the same PR. Defaults to true
   branches:
-    include: [ dev, test-dev, master ] # branch names which will trigger a build
+    include: [ dev, v1.*, master ] # branch names which will trigger a build
 
 name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
 
@@ -29,7 +29,7 @@ jobs:
         displayName: Windows Build
         inputs:
           filename: build.cmd
-          arguments: 'buildRelease ' # Run an  build
+          arguments: 'buildRelease incremental targetBranch=v1.3' # Run an incremental build
         continueOnError: true
         condition: eq( variables['Agent.OS'], 'Windows_NT' )
       - task: CopyFiles@2
@@ -42,7 +42,7 @@ jobs:
       - task: PublishBuildArtifacts@1
         inputs:
           pathtoPublish: $(Build.ArtifactStagingDirectory)
-          artifactName: istOutput
+          artifactName: 'incrementalistOutput-$(Build.BuildId)'
       - script: 'echo 1>&2'
         failOnStderr: true
         displayName: 'If above is partially succeeded, then fail'
@@ -54,50 +54,60 @@ jobs:
       displayName: '.NET Framework Unit Tests (Windows)'
       vmImage: 'vs2017-win2016'
       scriptFileName: build.cmd
-      scriptArgs: runTests 
+      scriptArgs: runTests incremental targetBranch=v1.3
       outputDirectory: 'TestResults'
+      artifactName: 'netfx_tests_windows-$(Build.BuildId)'
 
   - template: azure-pipeline.template.yaml
     parameters:
       name: 'net_core_tests_windows'
       displayName: '.NET Core Unit Tests (Windows)'
       vmImage: 'vs2017-win2016'
       scriptFileName: build.cmd
-      scriptArgs: runTestsNetCore 
+      scriptArgs: runTestsNetCore incremental targetBranch=v1.3
       outputDirectory: 'TestResults'
+      artifactName: 'net_core_tests_windows-$(Build.BuildId)'
 
   - template: azure-pipeline.template.yaml
     parameters:
       name: 'net_core_tests_linux'
       displayName: '.NET Core Unit Tests (Linux)'
       vmImage: 'ubuntu-16.04'
       scriptFileName: './build.sh'
-      scriptArgs: runTestsNetCore 
+      scriptArgs: runTestsNetCore incremental targetBranch=v1.3
       outputDirectory: 'TestResults'
+      artifactName: 'net_core_tests_linux-$(Build.BuildId)'
 
-  - template: azure-pipeline.template.yaml
+  - template: azure-pipeline.mntr-template.yaml
     parameters:
       name: 'net_core_mntr_windows'
       displayName: '.NET Core Multi-Node Tests (Windows)'
       vmImage: 'vs2017-win2016'
       scriptFileName: 'build.cmd'
-      scriptArgs: MultiNodeTestsNetCore 
+      scriptArgs: MultiNodeTestsNetCore incremental targetBranch=v1.3
       outputDirectory: 'TestResults'
+      artifactName: 'net_core_mntr_windows-$(Build.BuildId)'
+      mntrFailuresDir: 'TestResults\\multinode'
+      mntrFailuresArtifactName: 'net_core_mntr_FAILED_windows-$(Build.BuildId)'
 
-  - template: azure-pipeline.template.yaml
+  - template: azure-pipeline.mntr-template.yaml
     parameters:
       name: 'net_fx_mntr_windows'
       displayName: '.NET Framework Multi-Node Tests (Windows)'
       vmImage: 'vs2017-win2016'
       scriptFileName: 'build.cmd'
-      scriptArgs: MultiNodeTests 
+      scriptArgs: MultiNodeTests incremental targetBranch=v1.3
       outputDirectory: 'TestResults'
+      artifactName: 'net_fx_mntr_windows-$(Build.BuildId)'
+      mntrFailuresDir: 'TestResults\\multinode'
+      mntrFailuresArtifactName: 'net_fx_mntr_FAILED_windows-$(Build.BuildId)'
 
   - template: azure-pipeline.template.yaml
     parameters:
       name: 'nuget_pack'
       displayName: 'NuGet Pack'
       vmImage: 'vs2017-win2016'
       scriptFileName: build.cmd
-      scriptArgs: CreateNuget nugetprerelease=dev 
+      scriptArgs: CreateNuget nugetprerelease=dev incremental targetBranch=v1.3
       outputDirectory: 'bin/nuget'
+      artifactName: 'nuget_pack-$(Build.BuildId)'
diff --git a/build.fsx b/build.fsx
@@ -94,8 +94,8 @@ let getAffectedProjects =
 Target "ComputeIncrementalChanges" (fun _ ->
     if runIncrementally then
         let targetBranch = match getBuildParam "targetBranch" with
-                            | "" -> "v1.3"
-                            | null -> "v1.3"
+                            | "" -> "dev"
+                            | null -> "dev"
                             | b -> b
         let incrementalistPath =
                 let incrementalistDir = toolsDir @@ "incrementalist"