Run windows tests in parallel

aminya · aminya · commit 0ad0a505aa73 · 2020-07-10T23:52:34.000-05:00
diff --git a/script/test b/script/test
@@ -205,28 +205,24 @@ function requestedTestSuites () {
 
 function testSuitesForPlatform (platform) {
   let suites = []
-  switch (platform) {
-    case 'darwin':
-      const PACKAGES_TO_TEST_IN_PARALLEL = 23
-
-      if (process.env.ATOM_RUN_CORE_TESTS === 'true') {
-        suites = [runCoreMainProcessTests, runCoreRenderProcessTests]
-      } else if (process.env.ATOM_RUN_PACKAGE_TESTS === '1') {
-        suites = packageTestSuites.slice(0, PACKAGES_TO_TEST_IN_PARALLEL)
-      } else if (process.env.ATOM_RUN_PACKAGE_TESTS === '2') {
-        suites = packageTestSuites.slice(PACKAGES_TO_TEST_IN_PARALLEL)
-      } else {
-        suites = [runCoreMainProcessTests, runCoreRenderProcessTests].concat(packageTestSuites)
-      }
-      break
-    case 'win32':
-      suites = (process.arch === 'x64') ? [runCoreMainProcessTests, runCoreRenderProcessTests] : [runCoreMainProcessTests]
-      break
-    case 'linux':
-      suites = [runCoreMainProcessTests]
-      break
-    default:
-      console.log(`Unrecognized platform: ${platform}`)
+  if ((platform === 'darwin') || (platform === 'win32' && process.arch === 'x64'))  {
+    const PACKAGES_TO_TEST_IN_PARALLEL = 23
+
+    if (process.env.ATOM_RUN_CORE_TESTS === 'true') {
+      suites = [runCoreMainProcessTests, runCoreRenderProcessTests]
+    } else if (process.env.ATOM_RUN_PACKAGE_TESTS === '1') {
+      suites = packageTestSuites.slice(0, PACKAGES_TO_TEST_IN_PARALLEL)
+    } else if (process.env.ATOM_RUN_PACKAGE_TESTS === '2') {
+      suites = packageTestSuites.slice(PACKAGES_TO_TEST_IN_PARALLEL)
+    } else {
+      suites = [runCoreMainProcessTests, runCoreRenderProcessTests].concat(packageTestSuites)
+    }
+  }
+  else if ((platform === 'linux') || (platform === 'win32' && process.arch === 'x86')) {
+    suites = [runCoreMainProcessTests]
+  }
+  else {
+    console.log(`Unrecognized platform: ${platform}`)
   }
 
   if (argv.skipMainProcessTests) {
diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml
@@ -1,5 +1,5 @@
 jobs:
-  - job: Windows
+  - job: Windows_Build
     dependsOn: GetReleaseVersion
     timeoutInMinutes: 180
     strategy:
@@ -114,69 +114,13 @@ jobs:
           npm_config_build_from_source: true
         displayName: Build Atom
 
-      - script: |
-          %RunCommand% script\test.cmd
-        env:
-          CI: true
-          CI_PROVIDER: VSTS
-          ATOM_JASMINE_REPORTER: list
-          TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)\junit
-          BUILD_ARCH: $(buildArch)
-        displayName: Run tests
-        condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true'))
-
-      - script: >
-          %RunCommand% script\postprocess-junit-results.cmd
-          --search-folder %TEST_JUNIT_XML_ROOT% --test-results-files "**/*.xml"
-        env:
-          TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)\junit
-        displayName: Post-process test results
-        condition: ne(variables['Atom.SkipTests'], 'true')
-
-      - task: PublishTestResults@2
-        inputs:
-          testResultsFormat: JUnit
-          searchFolder: $(Common.TestResultsDirectory)\junit
-          testResultsFiles: '**/*.xml'
-          mergeTestResults: true
-          testRunTitle: Windows $(buildArch)
-        condition: ne(variables['Atom.SkipTests'], 'true')
-
-      - script: |
-          IF NOT EXIST "%ARTIFACT_STAGING_DIR%\crash-reports" MKDIR "%ARTIFACT_STAGING_DIR%\crash-reports"
-          IF EXIST "%Temp%\Atom Crashes" (
-            FOR %%a in ("%Temp%\Atom Crashes\*.dmp") DO XCOPY "%%a" "%ARTIFACT_STAGING_DIR%\crash-reports" /I
-          )
-        displayName: Stage crash reports
-        condition: failed()
-        env:
-          ARTIFACT_STAGING_DIR: $(Build.ArtifactStagingDirectory)
-
-      - task: PublishBuildArtifacts@1
-        inputs:
-          PathtoPublish: $(Build.ArtifactStagingDirectory)/crash-reports
-          ArtifactName: crash-reports
-        displayName: Publish crash reports on non-release branch
-        condition: and(failed(), eq(variables['ATOM_RELEASES_S3_KEY'], ''))
-
-      - script: >
-          node $(Build.SourcesDirectory)\script\vsts\upload-crash-reports.js --crash-report-path "%ARTIFACT_STAGING_DIR%\crash-reports" --s3-path "vsts-artifacts/%BUILD_ID%/"
-        env:
-          ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY)
-          ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET)
-          ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET)
-          ARTIFACT_STAGING_DIR: $(Build.ArtifactStagingDirectory)
-          BUILD_ID: $(Build.BuildId)
-        displayName: Upload crash reports to S3 on release branch
-        condition: and(failed(), ne(variables['ATOM_RELEASES_S3_KEY'], ''))
-
       - task: PublishBuildArtifacts@1
         inputs:
           PathtoPublish: $(Build.SourcesDirectory)/out/atom-x64-windows.zip
           ArtifactName: atom-x64-windows.zip
           ArtifactType: Container
         displayName: Upload atom-x64-windows.zip
-        condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['buildArch'], 'x64'))
+        condition: and(succeeded(), eq(variables['buildArch'], 'x64'))
 
       - task: PublishBuildArtifacts@1
         inputs:
@@ -217,7 +161,7 @@ jobs:
           ArtifactName: atom-windows.zip
           ArtifactType: Container
         displayName: Upload atom-windows.zip
-        condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['buildArch'], 'x86'))
+        condition: and(succeeded(), eq(variables['buildArch'], 'x86'))
 
       - task: PublishBuildArtifacts@1
         inputs:
@@ -251,3 +195,161 @@ jobs:
           ArtifactType: Container
         displayName: Upload RELEASES
         condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x86'))
+
+  - job: Windows_Tets
+    dependsOn: Windows_Build
+    timeoutInMinutes: 180
+    strategy:
+      maxParallel: 4
+      matrix:
+        core_x64:
+          RunCoreTests: true
+          RunPackageTests: false
+          buildArch: x64
+        core_x86:
+          RunCoreTests: true
+          RunPackageTests: false
+          buildArch: x86
+        packages-1:
+          RunCoreTests: false
+          RunPackageTests: 1
+          buildArch: x64
+        packages-2:
+          RunCoreTests: false
+          RunPackageTests: 2
+          buildArch: x64
+
+    pool:
+      vmImage: vs2017-win2016
+
+    variables:
+      AppName: $[ dependencies.GetReleaseVersion.outputs['Version.AppName'] ]
+      ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
+      IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ]
+      IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
+
+    steps:
+      - script: |
+          IF [%BUILD_ARCH%]==[x64] (
+            SET RunCommand=
+          ) ELSE (
+            SET RunCommand=node script\vsts\windows-run.js
+          )
+          echo RunCommand set to: %RunCommand%
+        env:
+          BUILD_ARCH: $(buildArch)
+        displayName: Set RunCommand based on the arch
+
+      - task: UsePythonVersion@0
+        inputs:
+          versionSpec: '2.7'
+
+      - task: NodeTool@0
+        inputs:
+          versionSpec: 12.13.1
+        displayName: Install Node.js 12.13.1
+
+      - script: |
+          ECHO Installing npm-windows-upgrade
+          npm install --global --production npm-windows-upgrade
+        displayName: Install npm-windows-upgrade
+
+      - script: |
+          ECHO Upgrading npm
+          npm-windows-upgrade --no-spinner --no-prompt --npm-version 6.12.1
+        displayName: Install npm 6.12.1
+
+      - script: |
+          npm install --global --production windows-build-tools@4.0
+        displayName: Install windows build tools
+
+      - script: |
+          cd script\vsts
+          npm install
+        displayName: Install Windows build dependencies
+
+      - template: cache.yml
+        parameters:
+          OS: windows
+
+      # Downloading the build artifacts
+      - task: DownloadBuildArtifacts@0
+        displayName: Download atom-x64-windows.zip
+        inputs:
+          artifactName: 'atom-x64-windows.zip'
+          downloadPath: $(Build.SourcesDirectory)
+        condition: and(succeeded(), eq(variables['buildArch'], 'x64'))
+
+      - script: unzip atom-x64-windows.zip/atom-x64-windows.zip -d out
+        displayName: Unzip atom-x64-windows.zip
+        condition: and(succeeded(), eq(variables['buildArch'], 'x64'))
+
+      - task: DownloadBuildArtifacts@0
+        displayName: Download atom-windows.zip
+        inputs:
+          artifactName: 'atom-windows.zip'
+          downloadPath: $(Build.SourcesDirectory)
+        condition: and(succeeded(), eq(variables['buildArch'], 'x86'))
+
+      - script: unzip atom-windows.zip/atom-windows.zip -d out
+        displayName: Unzip atom-windows.zip
+        condition: and(succeeded(), eq(variables['buildArch'], 'x86'))
+
+      # Run the tests
+      - script: |
+          %RunCommand% script\test.cmd
+        env:
+          CI: true
+          CI_PROVIDER: VSTS
+          ATOM_JASMINE_REPORTER: list
+          TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)\junit
+          ATOM_RUN_CORE_TESTS: $(RunCoreTests)
+          ATOM_RUN_PACKAGE_TESTS: $(RunPackageTests)
+          BUILD_ARCH: $(buildArch)
+        displayName: Run tests
+        condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true'))
+
+      - script: >
+          %RunCommand% script\postprocess-junit-results.cmd
+          --search-folder %TEST_JUNIT_XML_ROOT% --test-results-files "**/*.xml"
+        env:
+          TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)\junit
+        displayName: Post-process test results
+        condition: ne(variables['Atom.SkipTests'], 'true')
+
+      - task: PublishTestResults@2
+        inputs:
+          testResultsFormat: JUnit
+          searchFolder: $(Common.TestResultsDirectory)\junit
+          testResultsFiles: '**/*.xml'
+          mergeTestResults: true
+          testRunTitle: Windows $(buildArch)
+        condition: ne(variables['Atom.SkipTests'], 'true')
+
+      - script: |
+          IF NOT EXIST "%ARTIFACT_STAGING_DIR%\crash-reports" MKDIR "%ARTIFACT_STAGING_DIR%\crash-reports"
+          IF EXIST "%Temp%\Atom Crashes" (
+            FOR %%a in ("%Temp%\Atom Crashes\*.dmp") DO XCOPY "%%a" "%ARTIFACT_STAGING_DIR%\crash-reports" /I
+          )
+        displayName: Stage crash reports
+        condition: failed()
+        env:
+          ARTIFACT_STAGING_DIR: $(Build.ArtifactStagingDirectory)
+
+      - task: PublishBuildArtifacts@1
+        inputs:
+          PathtoPublish: $(Build.ArtifactStagingDirectory)/crash-reports
+          ArtifactName: crash-reports
+        displayName: Publish crash reports on non-release branch
+        condition: and(failed(), eq(variables['ATOM_RELEASES_S3_KEY'], ''))
+
+      - script: >
+          node $(Build.SourcesDirectory)\script\vsts\upload-crash-reports.js --crash-report-path "%ARTIFACT_STAGING_DIR%\crash-reports" --s3-path "vsts-artifacts/%BUILD_ID%/"
+        env:
+          ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY)
+          ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET)
+          ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET)
+          ARTIFACT_STAGING_DIR: $(Build.ArtifactStagingDirectory)
+          BUILD_ID: $(Build.BuildId)
+        displayName: Upload crash reports to S3 on release branch
+        condition: and(failed(), ne(variables['ATOM_RELEASES_S3_KEY'], ''))
