Merge pull request #19446 from atom/as/ci-parallelize-macos-tests

Parallelize macOS tests
2026-04-28 03:01:47 -04:00 · 2019-06-06 09:08:43 +02:00
parent c3f57146cc 587a4dd72d
commit 05d67529a7
4 changed files with 138 additions and 36 deletions
--- a/script/test
+++ b/script/test
@@ -116,10 +116,7 @@ for (let packageName in CONFIG.appMetadata.packageDependencies) {
  const testSubdir = ['spec', 'test'].find(subdir => fs.existsSync(path.join(repositoryPackagePath, subdir)))

  if (!testSubdir) {
-    packageTestSuites.push(function (callback) {
-      console.log(`Skipping tests for ${packageName} because no test folder was found`.bold.yellow)
-      callback(null, {exitCode: 0, step: `package-${packageName}`})
-    })
+    console.log(`No test folder found for package: ${packageName}`.yellow)
    continue
  }

@@ -201,7 +198,19 @@ function testSuitesForPlatform (platform) {
  let suites = []
  switch (platform) {
    case 'darwin':
-      suites = [runCoreMainProcessTests, runCoreRenderProcessTests, runBenchmarkTests].concat(packageTestSuites)
+      const PACKAGES_TO_TEST_IN_PARALLEL = 23
+
+      if (process.env.ATOM_RUN_CORE_MAIN_TESTS === 'true') {
+        suites = [runCoreMainProcessTests]
+      } else if (process.env.ATOM_RUN_CORE_RENDERER_TESTS === 'true') {
+        suites = [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]
--- a/script/vsts/nightly-release.yml
+++ b/script/vsts/nightly-release.yml
@@ -29,7 +29,7 @@ jobs:
  - GetReleaseVersion
  - Windows
  - Linux
-  - macOS
+  - macOS_tests

  variables:
    ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
--- a/script/vsts/platforms/macos.yml
+++ b/script/vsts/platforms/macos.yml
@@ -1,5 +1,6 @@
 jobs:
- job: macOS
+- job: macOS_build
+  displayName: macOS build
  dependsOn: GetReleaseVersion
  timeoutInMinutes: 180

@@ -69,6 +70,126 @@ jobs:
      CI_PROVIDER: VSTS
      ATOM_JASMINE_REPORTER: list
      TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit
+      ATOM_RUN_CORE_MAIN_TESTS: true
+    displayName: Run main process tests
+    condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true'))
+
+  - script: script/postprocess-junit-results --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: MacOS
+    condition: ne(variables['Atom.SkipTests'], 'true')
+
+  - script: |
+      mkdir -p $(Build.ArtifactStagingDirectory)/crash-reports
+      cp ${HOME}/Library/Logs/DiagnosticReports/*.crash $(Build.ArtifactStagingDirectory)/crash-reports
+    displayName: Stage Crash Reports
+    condition: failed()
+
+  - task: PublishBuildArtifacts@1
+    inputs:
+      PathtoPublish: $(Build.ArtifactStagingDirectory)/crash-reports
+      ArtifactName: crash-reports.zip
+    displayName: Upload Crash Reports
+    condition: failed()
+
+  - script: |
+      cp $(Build.SourcesDirectory)/out/*.zip $(Build.ArtifactStagingDirectory)
+    displayName: Stage Artifacts
+
+  - task: PublishBuildArtifacts@1
+    inputs:
+      PathtoPublish: $(Build.ArtifactStagingDirectory)/atom-mac.zip
+      ArtifactName: atom-mac.zip
+      ArtifactType: Container
+    displayName: Upload atom-mac.zip
+    condition: succeeded()
+
+  - task: PublishBuildArtifacts@1
+    inputs:
+      PathtoPublish: $(Build.ArtifactStagingDirectory)/atom-mac-symbols.zip
+      ArtifactName: atom-mac-symbols.zip
+      ArtifactType: Container
+    displayName: Upload atom-mac-symbols.zip
+    condition: succeeded()
+
+  - task: PublishBuildArtifacts@1
+    inputs:
+      PathtoPublish: $(Build.SourcesDirectory)/docs/output/atom-api.json
+      ArtifactName: atom-api.json
+      ArtifactType: Container
+    displayName: Upload atom-api.json
+    condition: succeeded()
+
+- job: macOS_tests
+  displayName: macOS test
+  dependsOn: macOS_build
+  timeoutInMinutes: 180
+  pool:
+    vmImage: macos-10.13
+  strategy:
+    maxParallel: 3
+    matrix:
+      core:
+        RunCoreRendererTests: true
+        RunPackageTests: false
+      packages-1:
+        RunCoreRendererTests: false
+        RunPackageTests: 1
+      packages-2:
+        RunCoreRendererTests: false
+        RunPackageTests: 2
+
+  steps:
+  - task: NodeTool@0
+    inputs:
+      versionSpec: 8.9.3
+    displayName: Install Node.js 8.9.3
+
+  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+    displayName: Restore node_modules cache
+    inputs:
+      keyfile: 'package.json, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json'
+      targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+      vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
+
+  - task: DownloadBuildArtifacts@0
+    displayName: Download atom-mac.zip
+    inputs:
+      artifactName: 'atom-mac.zip'
+      downloadPath: $(Build.SourcesDirectory)
+
+  - script: unzip atom-mac.zip/atom-mac.zip -d out
+    displayName: Unzip atom-mac.zip
+
+  - task: DownloadBuildArtifacts@0
+    displayName: Download atom-mac-symbols.zip
+    inputs:
+      artifactName: 'atom-mac-symbols.zip'
+      downloadPath: $(Build.SourcesDirectory)
+
+  - script: unzip atom-mac-symbols.zip/atom-mac-symbols.zip -d out
+    displayName: Unzip atom-mac-symbols.zip
+
+  - script: |
+      osascript -e 'tell application "System Events" to keystroke "x"' # clear screen saver
+      caffeinate -s script/test # Run with caffeinate to prevent screen saver
+    env:
+      CI: true
+      CI_PROVIDER: VSTS
+      ATOM_JASMINE_REPORTER: list
+      TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit
+      ATOM_RUN_CORE_RENDERER_TESTS: $(RunCoreRendererTests)
+      ATOM_RUN_PACKAGE_TESTS: $(RunPackageTests)
    displayName: Run tests
    condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true'))

@@ -87,40 +208,12 @@ jobs:
      testRunTitle: MacOS
    condition: ne(variables['Atom.SkipTests'], 'true')

-  - script: |
-      cp $(Build.SourcesDirectory)/out/*.zip $(Build.ArtifactStagingDirectory)
-    displayName: Stage Artifacts
-
  - script: |
      mkdir -p $(Build.ArtifactStagingDirectory)/crash-reports
      cp ${HOME}/Library/Logs/DiagnosticReports/*.crash $(Build.ArtifactStagingDirectory)/crash-reports
    displayName: Stage Crash Reports
    condition: failed()

-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.ArtifactStagingDirectory)/atom-mac.zip
-      ArtifactName: atom-mac.zip
-      ArtifactType: Container
-    displayName: Upload atom-mac.zip
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
-
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.ArtifactStagingDirectory)/atom-mac-symbols.zip
-      ArtifactName: atom-mac-symbols.zip
-      ArtifactType: Container
-    displayName: Upload atom-mac-symbols.zip
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
-
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/docs/output/atom-api.json
-      ArtifactName: atom-api.json
-      ArtifactType: Container
-    displayName: Upload atom-api.json
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
-
  - task: PublishBuildArtifacts@1
    inputs:
      PathtoPublish: $(Build.ArtifactStagingDirectory)/crash-reports
--- a/script/vsts/release-branch-build.yml
+++ b/script/vsts/release-branch-build.yml
@@ -34,7 +34,7 @@ jobs:
  - GetReleaseVersion
  - Windows
  - Linux
-  - macOS
+  - macOS_tests

  variables:
    ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]