From a9fd3daba9023330e4d7e6823abc1d74f1cdc903 Mon Sep 17 00:00:00 2001
From: Andreas Zerbst <andr317c@live.dk>
Date: Mon, 16 Dec 2024 18:48:47 +0100
Subject: [PATCH 1/9] Updated pipeline to publish acceptance test artifacts for
 each os. and to run tests from npm command

---
 build/azure-pipelines.yml            | 28 ++++++++++++++--------------
 build/nightly-E2E-test-pipelines.yml | 28 ++++++++++++++--------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
index 865d97081d2e..b3599a941df6 100644
--- a/build/azure-pipelines.yml
+++ b/build/azure-pipelines.yml
@@ -492,22 +492,22 @@ stages:
           matrix:
             LinuxPart1Of3:
               vmImage: "ubuntu-latest"
-              testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --shard=1/3'
+              testCommand: 'npm run smokeTest -- --shard=1/3'
             LinuxPart2Of3:
               vmImage: "ubuntu-latest"
-              testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --shard=2/3'
+              testCommand: 'npm run smokeTest -- --shard=2/3'
             LinuxPart3Of3:
               vmImage: "ubuntu-latest"
-              testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --shard=3/3'
+              testCommand: 'npm run smokeTest -- --shard=3/3'
             WindowsPart1Of3:
               vmImage: "windows-latest"
-              testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --shard=1/3'
+              testCommand: 'npm run smokeTest -- --shard=1/3'
             WindowsPart2Of3:
               vmImage: "windows-latest"
-              testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --shard=2/3'
+              testCommand: 'npm run smokeTest -- --shard=2/3'
             WindowsPart3Of3:
               vmImage: "windows-latest"
-              testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --shard=3/3'
+              testCommand: 'npm run smokeTest -- --shard=3/3'
         pool:
           vmImage: $(vmImage)
         steps:
@@ -623,7 +623,7 @@ stages:
             condition: succeededOrFailed()
             inputs:
               targetPath: $(Build.ArtifactStagingDirectory)
-              artifact: "Acceptance Tests - $(Agent.JobName) - Attempt #$(System.JobAttempt)"
+              artifact: "Acceptance Tests - $(Agent.OS) - Attempt #$(System.JobAttempt)"
 
       - job:
         displayName: E2E Tests (SQL Server)
@@ -635,29 +635,29 @@ stages:
           matrix:
             ${{ if eq(parameters.sqlServerLinuxAcceptanceTests, True) }}:
               LinuxPart1Of3:
-                testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --grep-invert "Users" --shard=1/3'
+                testCommand: 'npm run smokeTestSqlite -- --shard=1/3'
                 vmImage: "ubuntu-latest"
                 SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
                 CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
               LinuxPart2Of3:
-                testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --grep-invert "Users" --shard=2/3'
+                testCommand: 'npm run smokeTestSqlite -- --shard=2/3'
                 vmImage: "ubuntu-latest"
                 SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
                 CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
               LinuxPart3Of3:
-                testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --grep-invert "Users" --shard=3/3'
+                testCommand: 'npm run smokeTestSqlite -- --shard=3/3'
                 vmImage: "ubuntu-latest"
                 SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
                 CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
             WindowsPart1Of3:
               vmImage: "windows-latest"
-              testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --grep-invert "Users" --shard=1/3'
+              testCommand: 'npm run smokeTestSqlite -- --shard=1/3'
             WindowsPart2Of3:
               vmImage: "windows-latest"
-              testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --grep-invert "Users" --shard=2/3'
+              testCommand: 'npm run smokeTestSqlite -- --shard=2/3'
             WindowsPart3Of3:
               vmImage: "windows-latest"
-              testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --grep-invert "Users" --shard=3/3'
+              testCommand: 'npm run smokeTestSqlite -- --shard=3/3'
         pool:
           vmImage: $(vmImage)
         steps:
@@ -790,7 +790,7 @@ stages:
             condition: succeededOrFailed()
             inputs:
               targetPath: $(Build.ArtifactStagingDirectory)
-              artifact: "Acceptance Tests - $(Agent.JobName) - Attempt #$(System.JobAttempt)"
+              artifact: "Acceptance Tests - $(Agent.OS) - Attempt #$(System.JobAttempt)"
 
   ###############################################
   ## Release
diff --git a/build/nightly-E2E-test-pipelines.yml b/build/nightly-E2E-test-pipelines.yml
index 42cc5973c592..4ded4dbc7627 100644
--- a/build/nightly-E2E-test-pipelines.yml
+++ b/build/nightly-E2E-test-pipelines.yml
@@ -111,22 +111,22 @@ stages:
           matrix:
             LinuxPart1Of3:
               vmImage: "ubuntu-latest"
-              testCommand: "npx playwright test DefaultConfig --shard=1/3"
+              testCommand: "npm run test -- --shard=1/3"
             LinuxPart2Of3:
               vmImage: "ubuntu-latest"
-              testCommand: "npx playwright test DefaultConfig --shard=2/3"
+              testCommand: "npm run test -- --shard=2/3"
             LinuxPart3Of3:
               vmImage: "ubuntu-latest"
-              testCommand: "npx playwright test DefaultConfig --shard=3/3"
+              testCommand: "npm run test -- --shard=3/3"
             WindowsPart1Of3:
               vmImage: "windows-latest"
-              testCommand: "npx playwright test DefaultConfig --shard=1/3"
+              testCommand: "npm run test -- --shard=1/3"
             WindowsPart2Of3:
               vmImage: "windows-latest"
-              testCommand: "npx playwright test DefaultConfig --shard=2/3"
+              testCommand: "npm run test -- --shard=2/3"
             WindowsPart3Of3:
               vmImage: "windows-latest"
-              testCommand: "npx playwright test DefaultConfig --shard=3/3"
+              testCommand: "npm run test -- --shard=3/3"
         pool:
           vmImage: $(vmImage)
         steps:
@@ -246,7 +246,7 @@ stages:
             condition: succeededOrFailed()
             inputs:
               targetPath: $(Build.ArtifactStagingDirectory)
-              artifact: 'Acceptance Tests - $(Agent.JobName) - Attempt #$(System.JobAttempt)'
+              artifact: "Acceptance Tests - $(Agent.OS) - Attempt #$(System.JobAttempt)"
 
       - job:
         displayName: E2E Tests (SQL Server)
@@ -258,29 +258,29 @@ stages:
         strategy:
           matrix:
             LinuxPart1Of3:
-              testCommand: "npx playwright test DefaultConfig --grep-invert \"Users\" --shard=1/3"
+              testCommand: "npm run testSqlite -- --shard=1/3"
               vmImage: "ubuntu-latest"
               SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
               CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
             LinuxPart2Of3:
-              testCommand: "npx playwright test DefaultConfig --grep-invert \"Users\" --shard=2/3"
+              testCommand: "npm run testSqlite -- --shard=2/3"
               vmImage: "ubuntu-latest"
               SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
               CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
             LinuxPart3Of3:
-              testCommand: "npx playwright test DefaultConfig  --grep-invert \"Users\" --shard=3/3"
+              testCommand: "npm run testSqlite -- --shard=3/3"
               vmImage: "ubuntu-latest"
               SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
               CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
             WindowsPart1Of3:
               vmImage: "windows-latest"
-              testCommand: "npx playwright test DefaultConfig --grep-invert \"Users\" --shard=1/3"
+              testCommand: "npm run testSqlite -- --shard=1/3"
             WindowsPart2Of3:
               vmImage: "windows-latest"
-              testCommand: "npx playwright test DefaultConfig --grep-invert \"Users\" --shard=2/3"
+              testCommand: "npm run testSqlite -- --shard=2/3"
             WindowsPart3Of3:
               vmImage: "windows-latest"
-              testCommand: "npx playwright test DefaultConfig --grep-invert \"Users\" --shard=3/3"
+              testCommand: "npm run testSqlite -- --shard=3/3"
         pool:
           vmImage: $(vmImage)
         steps:
@@ -417,4 +417,4 @@ stages:
             condition: succeededOrFailed()
             inputs:
               targetPath: $(Build.ArtifactStagingDirectory)
-              artifact: 'Acceptance Tests - $(Agent.JobName) - Attempt #$(System.JobAttempt)'
+              artifact: "Acceptance Tests - $(Agent.OS) - Attempt #$(System.JobAttempt)"

From b0c2b59dd232e8ba2166365b2143fb172d43d04f Mon Sep 17 00:00:00 2001
From: Andreas Zerbst <andr317c@live.dk>
Date: Mon, 16 Dec 2024 20:37:40 +0100
Subject: [PATCH 2/9] Adjustment to the targetPath

---
 build/azure-pipelines.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
index b3599a941df6..b177ccdbed23 100644
--- a/build/azure-pipelines.yml
+++ b/build/azure-pipelines.yml
@@ -622,8 +622,8 @@ stages:
             displayName: Publish test artifacts
             condition: succeededOrFailed()
             inputs:
-              targetPath: $(Build.ArtifactStagingDirectory)
-              artifact: "Acceptance Tests - $(Agent.OS) - Attempt #$(System.JobAttempt)"
+              targetPath: "$(Build.ArtifactStagingDirectory)/Acceptance Tests"
+              artifact: "$(Agent.OS) - Attempt #$(System.JobAttempt)"
 
       - job:
         displayName: E2E Tests (SQL Server)
@@ -776,7 +776,7 @@ stages:
             displayName: Stop SQL Server LocalDB (Windows)
             condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
 
-          # Copy artifacts
+           # Copy artifacts
           - pwsh: |
               if (Test-Path tests/Umbraco.Tests.AcceptanceTest/results/*) {
                 Copy-Item tests/Umbraco.Tests.AcceptanceTest/results $(Build.ArtifactStagingDirectory) -Recurse
@@ -791,7 +791,6 @@ stages:
             inputs:
               targetPath: $(Build.ArtifactStagingDirectory)
               artifact: "Acceptance Tests - $(Agent.OS) - Attempt #$(System.JobAttempt)"
-
   ###############################################
   ## Release
   ###############################################

From f554fb3c71203d3752d23bcb5b238cf2858bc179 Mon Sep 17 00:00:00 2001
From: Andreas Zerbst <andr317c@live.dk>
Date: Wed, 18 Dec 2024 10:35:13 +0100
Subject: [PATCH 3/9] Publish all in results folder

---
 build/azure-pipelines.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
index b177ccdbed23..05fc8b290bad 100644
--- a/build/azure-pipelines.yml
+++ b/build/azure-pipelines.yml
@@ -612,7 +612,7 @@ stages:
           # Copy artifacts
           - pwsh: |
               if (Test-Path tests/Umbraco.Tests.AcceptanceTest/results/*) {
-                Copy-Item tests/Umbraco.Tests.AcceptanceTest/results $(Build.ArtifactStagingDirectory) -Recurse
+                Copy-Item tests/Umbraco.Tests.AcceptanceTest/results/* $(Build.ArtifactStagingDirectory) -Recurse
               }
             displayName: Copy Playwright results
             condition: succeededOrFailed()
@@ -622,8 +622,8 @@ stages:
             displayName: Publish test artifacts
             condition: succeededOrFailed()
             inputs:
-              targetPath: "$(Build.ArtifactStagingDirectory)/Acceptance Tests"
-              artifact: "$(Agent.OS) - Attempt #$(System.JobAttempt)"
+              targetPath: "$(Build.ArtifactStagingDirectory)/AcceptanceTests"
+#              artifact: "$(Agent.OS) - Attempt #$(System.JobAttempt)"
 
       - job:
         displayName: E2E Tests (SQL Server)
@@ -779,7 +779,7 @@ stages:
            # Copy artifacts
           - pwsh: |
               if (Test-Path tests/Umbraco.Tests.AcceptanceTest/results/*) {
-                Copy-Item tests/Umbraco.Tests.AcceptanceTest/results $(Build.ArtifactStagingDirectory) -Recurse
+                Copy-Item tests/Umbraco.Tests.AcceptanceTest/results/* $(Build.ArtifactStagingDirectory) -Recurse
               }
             displayName: Copy Playwright results
             condition: succeededOrFailed()
@@ -789,8 +789,8 @@ stages:
             displayName: Publish test artifacts
             condition: succeededOrFailed()
             inputs:
-              targetPath: $(Build.ArtifactStagingDirectory)
-              artifact: "Acceptance Tests - $(Agent.OS) - Attempt #$(System.JobAttempt)"
+              targetPath: $(Build.ArtifactStagingDirectory)/AcceptanceTests
+#              artifact: "Acceptance Tests - $(Agent.OS) - Attempt #$(System.JobAttempt)"
   ###############################################
   ## Release
   ###############################################

From 6bf470ce96ae950b339aea4712e3bab0289bb1a1 Mon Sep 17 00:00:00 2001
From: Andreas Zerbst <andr317c@live.dk>
Date: Wed, 18 Dec 2024 12:08:50 +0100
Subject: [PATCH 4/9] Moved folder

---
 build/azure-pipelines.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
index 05fc8b290bad..038340d06bce 100644
--- a/build/azure-pipelines.yml
+++ b/build/azure-pipelines.yml
@@ -622,8 +622,8 @@ stages:
             displayName: Publish test artifacts
             condition: succeededOrFailed()
             inputs:
-              targetPath: "$(Build.ArtifactStagingDirectory)/AcceptanceTests"
-#              artifact: "$(Agent.OS) - Attempt #$(System.JobAttempt)"
+              targetPath: "$(Build.ArtifactStagingDirectory)"
+              artifact: "Acceptance Tests - $(Agent.OS) - Attempt #$(System.JobAttempt)"
 
       - job:
         displayName: E2E Tests (SQL Server)
@@ -789,8 +789,8 @@ stages:
             displayName: Publish test artifacts
             condition: succeededOrFailed()
             inputs:
-              targetPath: $(Build.ArtifactStagingDirectory)/AcceptanceTests
-#              artifact: "Acceptance Tests - $(Agent.OS) - Attempt #$(System.JobAttempt)"
+              targetPath: $(Build.ArtifactStagingDirectory)
+              artifact: "Acceptance Tests - $(Agent.OS) - Attempt #$(System.JobAttempt)"
   ###############################################
   ## Release
   ###############################################

From 830f75227e246d2e08840bc3ef55cc40ad0bcf6e Mon Sep 17 00:00:00 2001
From: Andreas Zerbst <andr317c@live.dk>
Date: Thu, 19 Dec 2024 14:17:38 +0100
Subject: [PATCH 5/9] Reverted changes

---
 build/azure-pipelines.yml            | 7 +++----
 build/nightly-E2E-test-pipelines.yml | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
index 038340d06bce..8a147125c795 100644
--- a/build/azure-pipelines.yml
+++ b/build/azure-pipelines.yml
@@ -622,9 +622,8 @@ stages:
             displayName: Publish test artifacts
             condition: succeededOrFailed()
             inputs:
-              targetPath: "$(Build.ArtifactStagingDirectory)"
-              artifact: "Acceptance Tests - $(Agent.OS) - Attempt #$(System.JobAttempt)"
-
+              targetPath: $(Build.ArtifactStagingDirectory)
+              artifact: "Acceptance Tests - $(Agent.JobName) - Attempt #$(System.JobAttempt)"
       - job:
         displayName: E2E Tests (SQL Server)
         variables:
@@ -784,7 +783,7 @@ stages:
             displayName: Copy Playwright results
             condition: succeededOrFailed()
 
-          # Publish
+            # Publish
           - task: PublishPipelineArtifact@1
             displayName: Publish test artifacts
             condition: succeededOrFailed()
diff --git a/build/nightly-E2E-test-pipelines.yml b/build/nightly-E2E-test-pipelines.yml
index 4ded4dbc7627..6b84c1e331dd 100644
--- a/build/nightly-E2E-test-pipelines.yml
+++ b/build/nightly-E2E-test-pipelines.yml
@@ -246,7 +246,7 @@ stages:
             condition: succeededOrFailed()
             inputs:
               targetPath: $(Build.ArtifactStagingDirectory)
-              artifact: "Acceptance Tests - $(Agent.OS) - Attempt #$(System.JobAttempt)"
+              artifact: 'Acceptance Tests - $(Agent.JobName) - Attempt #$(System.JobAttempt)'
 
       - job:
         displayName: E2E Tests (SQL Server)

From b4e4a0576dffd44621cd7efb4ba5c37979257d04 Mon Sep 17 00:00:00 2001
From: Andreas Zerbst <andr317c@live.dk>
Date: Thu, 19 Dec 2024 15:52:15 +0100
Subject: [PATCH 6/9] Added all results in test folder

---
 build/azure-pipelines.yml            | 6 +++---
 build/nightly-E2E-test-pipelines.yml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
index 8a147125c795..faba0fb33b54 100644
--- a/build/azure-pipelines.yml
+++ b/build/azure-pipelines.yml
@@ -775,7 +775,7 @@ stages:
             displayName: Stop SQL Server LocalDB (Windows)
             condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
 
-           # Copy artifacts
+          # Copy artifacts
           - pwsh: |
               if (Test-Path tests/Umbraco.Tests.AcceptanceTest/results/*) {
                 Copy-Item tests/Umbraco.Tests.AcceptanceTest/results/* $(Build.ArtifactStagingDirectory) -Recurse
@@ -783,13 +783,13 @@ stages:
             displayName: Copy Playwright results
             condition: succeededOrFailed()
 
-            # Publish
+          # Publish
           - task: PublishPipelineArtifact@1
             displayName: Publish test artifacts
             condition: succeededOrFailed()
             inputs:
               targetPath: $(Build.ArtifactStagingDirectory)
-              artifact: "Acceptance Tests - $(Agent.OS) - Attempt #$(System.JobAttempt)"
+              artifact: "Acceptance Tests - $(Agent.JobName) - Attempt #$(System.JobAttempt)"
   ###############################################
   ## Release
   ###############################################
diff --git a/build/nightly-E2E-test-pipelines.yml b/build/nightly-E2E-test-pipelines.yml
index 6b84c1e331dd..8c6d577c0985 100644
--- a/build/nightly-E2E-test-pipelines.yml
+++ b/build/nightly-E2E-test-pipelines.yml
@@ -235,7 +235,7 @@ stages:
           # Copy artifacts
           - pwsh: |
               if (Test-Path tests/Umbraco.Tests.AcceptanceTest/results/*) {
-                Copy-Item tests/Umbraco.Tests.AcceptanceTest/results $(Build.ArtifactStagingDirectory) -Recurse
+                Copy-Item tests/Umbraco.Tests.AcceptanceTest/results/* $(Build.ArtifactStagingDirectory) -Recurse
               }
             displayName: Copy Playwright results
             condition: succeededOrFailed()
@@ -406,7 +406,7 @@ stages:
           # Copy artifacts
           - pwsh: |
               if (Test-Path tests/Umbraco.Tests.AcceptanceTest/results/*) {
-                Copy-Item tests/Umbraco.Tests.AcceptanceTest/results $(Build.ArtifactStagingDirectory) -Recurse
+                Copy-Item tests/Umbraco.Tests.AcceptanceTest/results/* $(Build.ArtifactStagingDirectory) -Recurse
               }
             displayName: Copy Playwright results
             condition: succeededOrFailed()
@@ -417,4 +417,4 @@ stages:
             condition: succeededOrFailed()
             inputs:
               targetPath: $(Build.ArtifactStagingDirectory)
-              artifact: "Acceptance Tests - $(Agent.OS) - Attempt #$(System.JobAttempt)"
+              artifact: 'Acceptance Tests - $(Agent.JobName) - Attempt #$(System.JobAttempt)'

From ce50fbd53887f7c7d7e0bb8e129a21a85015308f Mon Sep 17 00:00:00 2001
From: Andreas Zerbst <andr317c@live.dk>
Date: Thu, 19 Dec 2024 17:10:08 +0100
Subject: [PATCH 7/9] Updated naming

---
 build/azure-pipelines.yml            | 4 ++--
 build/nightly-E2E-test-pipelines.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
index faba0fb33b54..eb98a4aee263 100644
--- a/build/azure-pipelines.yml
+++ b/build/azure-pipelines.yml
@@ -623,7 +623,7 @@ stages:
             condition: succeededOrFailed()
             inputs:
               targetPath: $(Build.ArtifactStagingDirectory)
-              artifact: "Acceptance Tests - $(Agent.JobName) - Attempt #$(System.JobAttempt)"
+              artifact: "Acceptance Test Results - $(Agent.JobName) - Attempt #$(System.JobAttempt)"
       - job:
         displayName: E2E Tests (SQL Server)
         variables:
@@ -789,7 +789,7 @@ stages:
             condition: succeededOrFailed()
             inputs:
               targetPath: $(Build.ArtifactStagingDirectory)
-              artifact: "Acceptance Tests - $(Agent.JobName) - Attempt #$(System.JobAttempt)"
+              artifact: "Acceptance Test Results - $(Agent.JobName) - Attempt #$(System.JobAttempt)"
   ###############################################
   ## Release
   ###############################################
diff --git a/build/nightly-E2E-test-pipelines.yml b/build/nightly-E2E-test-pipelines.yml
index 8c6d577c0985..23715c8c2cdb 100644
--- a/build/nightly-E2E-test-pipelines.yml
+++ b/build/nightly-E2E-test-pipelines.yml
@@ -246,7 +246,7 @@ stages:
             condition: succeededOrFailed()
             inputs:
               targetPath: $(Build.ArtifactStagingDirectory)
-              artifact: 'Acceptance Tests - $(Agent.JobName) - Attempt #$(System.JobAttempt)'
+              artifact: 'Acceptance Test Results - $(Agent.JobName) - Attempt #$(System.JobAttempt)'
 
       - job:
         displayName: E2E Tests (SQL Server)
@@ -417,4 +417,4 @@ stages:
             condition: succeededOrFailed()
             inputs:
               targetPath: $(Build.ArtifactStagingDirectory)
-              artifact: 'Acceptance Tests - $(Agent.JobName) - Attempt #$(System.JobAttempt)'
+              artifact: 'Acceptance Test Results - $(Agent.JobName) - Attempt #$(System.JobAttempt)'

From 452168b0a5e3e47db161312638b6a8ed8fd19201 Mon Sep 17 00:00:00 2001
From: Andreas Zerbst <andr317c@live.dk>
Date: Fri, 20 Dec 2024 09:11:38 +0100
Subject: [PATCH 8/9] Used semicolon

---
 build/azure-pipelines.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
index eb98a4aee263..318ae7907ac0 100644
--- a/build/azure-pipelines.yml
+++ b/build/azure-pipelines.yml
@@ -492,22 +492,22 @@ stages:
           matrix:
             LinuxPart1Of3:
               vmImage: "ubuntu-latest"
-              testCommand: 'npm run smokeTest -- --shard=1/3'
+              testCommand: "npm run smokeTest -- --shard=1/3"
             LinuxPart2Of3:
               vmImage: "ubuntu-latest"
-              testCommand: 'npm run smokeTest -- --shard=2/3'
+              testCommand: "npm run smokeTest -- --shard=2/3"
             LinuxPart3Of3:
               vmImage: "ubuntu-latest"
-              testCommand: 'npm run smokeTest -- --shard=3/3'
+              testCommand: "npm run smokeTest -- --shard=3/3"
             WindowsPart1Of3:
               vmImage: "windows-latest"
-              testCommand: 'npm run smokeTest -- --shard=1/3'
+              testCommand: "npm run smokeTest -- --shard=1/3"
             WindowsPart2Of3:
               vmImage: "windows-latest"
-              testCommand: 'npm run smokeTest -- --shard=2/3'
+              testCommand: "npm run smokeTest -- --shard=2/3"
             WindowsPart3Of3:
               vmImage: "windows-latest"
-              testCommand: 'npm run smokeTest -- --shard=3/3'
+              testCommand: "npm run smokeTest -- --shard=3/3"
         pool:
           vmImage: $(vmImage)
         steps:
@@ -634,29 +634,29 @@ stages:
           matrix:
             ${{ if eq(parameters.sqlServerLinuxAcceptanceTests, True) }}:
               LinuxPart1Of3:
-                testCommand: 'npm run smokeTestSqlite -- --shard=1/3'
+                testCommand: "npm run smokeTestSqlite -- --shard=1/3"
                 vmImage: "ubuntu-latest"
                 SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
                 CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
               LinuxPart2Of3:
-                testCommand: 'npm run smokeTestSqlite -- --shard=2/3'
+                testCommand: "npm run smokeTestSqlite -- --shard=2/3"
                 vmImage: "ubuntu-latest"
                 SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
                 CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
               LinuxPart3Of3:
-                testCommand: 'npm run smokeTestSqlite -- --shard=3/3'
+                testCommand: "npm run smokeTestSqlite -- --shard=3/3"
                 vmImage: "ubuntu-latest"
                 SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
                 CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
             WindowsPart1Of3:
               vmImage: "windows-latest"
-              testCommand: 'npm run smokeTestSqlite -- --shard=1/3'
+              testCommand: "npm run smokeTestSqlite -- --shard=1/3"
             WindowsPart2Of3:
               vmImage: "windows-latest"
-              testCommand: 'npm run smokeTestSqlite -- --shard=2/3'
+              testCommand: "npm run smokeTestSqlite -- --shard=2/3"
             WindowsPart3Of3:
               vmImage: "windows-latest"
-              testCommand: 'npm run smokeTestSqlite -- --shard=3/3'
+              testCommand: "npm run smokeTestSqlite -- --shard=3/3"
         pool:
           vmImage: $(vmImage)
         steps:

From 19b3669aa45cc974488dcb4eb57c2588fdba193c Mon Sep 17 00:00:00 2001
From: Andreas Zerbst <andr317c@live.dk>
Date: Fri, 20 Dec 2024 09:11:49 +0100
Subject: [PATCH 9/9] Additional semicolons

---
 build/nightly-E2E-test-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/nightly-E2E-test-pipelines.yml b/build/nightly-E2E-test-pipelines.yml
index 23715c8c2cdb..9435aadfd840 100644
--- a/build/nightly-E2E-test-pipelines.yml
+++ b/build/nightly-E2E-test-pipelines.yml
@@ -246,7 +246,7 @@ stages:
             condition: succeededOrFailed()
             inputs:
               targetPath: $(Build.ArtifactStagingDirectory)
-              artifact: 'Acceptance Test Results - $(Agent.JobName) - Attempt #$(System.JobAttempt)'
+              artifact: "Acceptance Test Results - $(Agent.JobName) - Attempt #$(System.JobAttempt)"
 
       - job:
         displayName: E2E Tests (SQL Server)
@@ -417,4 +417,4 @@ stages:
             condition: succeededOrFailed()
             inputs:
               targetPath: $(Build.ArtifactStagingDirectory)
-              artifact: 'Acceptance Test Results - $(Agent.JobName) - Attempt #$(System.JobAttempt)'
+              artifact: "Acceptance Test Results - $(Agent.JobName) - Attempt #$(System.JobAttempt)"