Skip to content

Commit 1b050eb

Browse files
andr317candr317c
authored
V13 QA added parallelization for E2E tests (#17995)
* Added script for running tests * Added parallelization for our E2E tests * Removed line * Removed condition
1 parent 2ffaede commit 1b050eb

File tree

2 files changed

+48
-16
lines changed

2 files changed

+48
-16
lines changed

‎build/azure-pipelines.yml

Lines changed: 47 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -415,10 +415,24 @@ stages:
415415
CONNECTIONSTRINGS__UMBRACODBDSN_PROVIDERNAME: Microsoft.Data.Sqlite
416416
strategy:
417417
matrix:
418-
Linux:
419-
vmImage: 'ubuntu-latest'
420-
Windows:
421-
vmImage: 'windows-latest'
418+
LinuxPart1Of3:
419+
vmImage: "ubuntu-latest"
420+
testCommand: "npm run test -- --shard=1/3"
421+
LinuxPart2Of3:
422+
vmImage: "ubuntu-latest"
423+
testCommand: "npm run test -- --shard=2/3"
424+
LinuxPart3Of3:
425+
vmImage: "ubuntu-latest"
426+
testCommand: "npm run test -- --shard=3/3"
427+
WindowsPart1Of3:
428+
vmImage: "windows-latest"
429+
testCommand: "npm run test -- --shard=1/3"
430+
WindowsPart2Of3:
431+
vmImage: "windows-latest"
432+
testCommand: "npm run test -- --shard=2/3"
433+
WindowsPart3Of3:
434+
vmImage: "windows-latest"
435+
testCommand: "npm run test -- --shard=3/3"
422436
pool:
423437
vmImage: $(vmImage)
424438
steps:
@@ -501,7 +515,7 @@ stages:
501515
workingDirectory: tests/Umbraco.Tests.AcceptanceTest
502516

503517
# Test
504-
- pwsh: npm run test --ignore-certificate-errors
518+
- pwsh: $(testCommand)
505519
displayName: Run Playwright tests
506520
continueOnError: true
507521
workingDirectory: tests/Umbraco.Tests.AcceptanceTest
@@ -522,7 +536,7 @@ stages:
522536
# Copy artifacts
523537
- pwsh: |
524538
if (Test-Path tests/Umbraco.Tests.AcceptanceTest/results/*) {
525-
Copy-Item tests/Umbraco.Tests.AcceptanceTest/results $(Build.ArtifactStagingDirectory) -Recurse
539+
Copy-Item tests/Umbraco.Tests.AcceptanceTest/results/* $(Build.ArtifactStagingDirectory) -Recurse
526540
}
527541
displayName: Copy Playwright results
528542
condition: succeededOrFailed()
@@ -533,8 +547,7 @@ stages:
533547
condition: succeededOrFailed()
534548
inputs:
535549
targetPath: $(Build.ArtifactStagingDirectory)
536-
artifact: 'Acceptance Tests - $(Agent.JobName) - Attempt #$(System.JobAttempt)'
537-
550+
artifact: "Acceptance Test Results - $(Agent.JobName) - Attempt #$(System.JobAttempt)"
538551
- job:
539552
displayName: E2E Tests (SQL Server)
540553
condition: or(eq(stageDependencies.Build.A.outputs['build.NBGV_PublicRelease'], 'True'), ${{parameters.sqlServerAcceptanceTests}})
@@ -544,12 +557,30 @@ stages:
544557
CONNECTIONSTRINGS__UMBRACODBDSN_PROVIDERNAME: Microsoft.Data.SqlClient
545558
strategy:
546559
matrix:
547-
Linux:
548-
vmImage: 'ubuntu-latest'
560+
LinuxPart1Of3:
561+
testCommand: "npm run testSqlite -- --shard=1/3"
562+
vmImage: "ubuntu-latest"
549563
SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
550-
CONNECTIONSTRINGS__UMBRACODBDSN: 'Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True'
551-
Windows:
552-
vmImage: 'windows-latest'
564+
CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
565+
LinuxPart2Of3:
566+
testCommand: "npm run testSqlite -- --shard=2/3"
567+
vmImage: "ubuntu-latest"
568+
SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
569+
CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
570+
LinuxPart3Of3:
571+
testCommand: "npm run testSqlite -- --shard=3/3"
572+
vmImage: "ubuntu-latest"
573+
SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
574+
CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
575+
WindowsPart1Of3:
576+
vmImage: "windows-latest"
577+
testCommand: "npm run testSqlite -- --shard=1/3"
578+
WindowsPart2Of3:
579+
vmImage: "windows-latest"
580+
testCommand: "npm run testSqlite -- --shard=2/3"
581+
WindowsPart3Of3:
582+
vmImage: "windows-latest"
583+
testCommand: "npm run testSqlite -- --shard=3/3"
553584
pool:
554585
vmImage: $(vmImage)
555586
steps:
@@ -640,7 +671,7 @@ stages:
640671
workingDirectory: tests/Umbraco.Tests.AcceptanceTest
641672

642673
# Test
643-
- pwsh: npm run test --ignore-certificate-errors
674+
- pwsh: $(testCommand)
644675
displayName: Run Playwright tests
645676
continueOnError: true
646677
workingDirectory: tests/Umbraco.Tests.AcceptanceTest
@@ -670,7 +701,7 @@ stages:
670701
# Copy artifacts
671702
- pwsh: |
672703
if (Test-Path tests/Umbraco.Tests.AcceptanceTest/results/*) {
673-
Copy-Item tests/Umbraco.Tests.AcceptanceTest/results $(Build.ArtifactStagingDirectory) -Recurse
704+
Copy-Item tests/Umbraco.Tests.AcceptanceTest/results/* $(Build.ArtifactStagingDirectory) -Recurse
674705
}
675706
displayName: Copy Playwright results
676707
condition: succeededOrFailed()
@@ -681,7 +712,7 @@ stages:
681712
condition: succeededOrFailed()
682713
inputs:
683714
targetPath: $(Build.ArtifactStagingDirectory)
684-
artifact: 'Acceptance Tests - $(Agent.JobName) - Attempt #$(System.JobAttempt)'
715+
artifact: "Acceptance Test Results - $(Agent.JobName) - Attempt #$(System.JobAttempt)"
685716

686717
###############################################
687718
## Release

‎tests/Umbraco.Tests.AcceptanceTest/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"config": "node config.js",
77
"ui": "npx playwright test --headed DefaultConfig",
88
"test": "npx playwright test DefaultConfig",
9+
"testSqlite": "npx playwright test DefaultConfig --grep-invert \"Users\"",
910
"all": "npx playwright test",
1011
"createTest": "node createTest.js"
1112
},

0 commit comments

Comments
 (0)