Skip to content

Commit 3db0ec7

Browse files
authored
V16 Updated nightly E2E pipeline to run correct test scripts (#19378)
* Set default to true, so we run the SQlite tests aswell * Updated test commands to run correct tests * Disabled Sqlite tests * Skip flaky test
1 parent 0f53ba8 commit 3db0ec7

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

build/nightly-E2E-test-pipelines.yml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ stages:
129129
# E2E Tests
130130
- job:
131131
displayName: E2E Tests (SQLite)
132-
# currently disabled due to DB locks randomly occuring.
133132
condition: eq(${{parameters.sqliteAcceptanceTests}}, True)
134133
timeoutInMinutes: 180
135134
variables:
@@ -140,22 +139,22 @@ stages:
140139
matrix:
141140
LinuxPart1Of3:
142141
vmImage: "ubuntu-latest"
143-
testCommand: "npm run test -- --shard=1/3"
142+
testCommand: "npm run testSqlite -- --shard=1/3"
144143
LinuxPart2Of3:
145144
vmImage: "ubuntu-latest"
146-
testCommand: "npm run test -- --shard=2/3"
145+
testCommand: "npm run testSqlite -- --shard=2/3"
147146
LinuxPart3Of3:
148147
vmImage: "ubuntu-latest"
149-
testCommand: "npm run test -- --shard=3/3"
148+
testCommand: "npm run testSqlite -- --shard=3/3"
150149
WindowsPart1Of3:
151150
vmImage: "windows-latest"
152-
testCommand: "npm run test -- --shard=1/3"
151+
testCommand: "npm run testSqlite -- --shard=1/3"
153152
WindowsPart2Of3:
154153
vmImage: "windows-latest"
155-
testCommand: "npm run test -- --shard=2/3"
154+
testCommand: "npm run testSqlite -- --shard=2/3"
156155
WindowsPart3Of3:
157156
vmImage: "windows-latest"
158-
testCommand: "npm run test -- --shard=3/3"
157+
testCommand: "npm run testSqlite -- --shard=3/3"
159158
pool:
160159
vmImage: $(vmImage)
161160
steps:
@@ -297,29 +296,29 @@ stages:
297296
strategy:
298297
matrix:
299298
LinuxPart1Of3:
300-
testCommand: "npm run testSqlite -- --shard=1/3"
299+
testCommand: "npm run test -- --shard=1/3"
301300
vmImage: "ubuntu-latest"
302301
SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
303302
CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);Encrypt=True;TrustServerCertificate=True"
304303
LinuxPart2Of3:
305-
testCommand: "npm run testSqlite -- --shard=2/3"
304+
testCommand: "npm run test -- --shard=2/3"
306305
vmImage: "ubuntu-latest"
307306
SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
308307
CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);Encrypt=True;TrustServerCertificate=True"
309308
LinuxPart3Of3:
310-
testCommand: "npm run testSqlite -- --shard=3/3"
309+
testCommand: "npm run test -- --shard=3/3"
311310
vmImage: "ubuntu-latest"
312311
SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
313312
CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);Encrypt=True;TrustServerCertificate=True"
314313
WindowsPart1Of3:
315314
vmImage: "windows-latest"
316-
testCommand: "npm run testSqlite -- --shard=1/3"
315+
testCommand: "npm run test -- --shard=1/3"
317316
WindowsPart2Of3:
318317
vmImage: "windows-latest"
319-
testCommand: "npm run testSqlite -- --shard=2/3"
318+
testCommand: "npm run test -- --shard=2/3"
320319
WindowsPart3Of3:
321320
vmImage: "windows-latest"
322-
testCommand: "npm run testSqlite -- --shard=3/3"
321+
testCommand: "npm run test -- --shard=3/3"
323322
pool:
324323
vmImage: $(vmImage)
325324
steps:

tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultiURLPicker.spec.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ test.afterEach(async ({umbracoApi}) => {
1717
await umbracoApi.documentType.ensureNameNotExists(documentTypeName);
1818
});
1919

20-
test('can create content with the document link', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
20+
// TODO, this is flaky on the pipeline, not locally. Look into why
21+
test.fixme('can create content with the document link', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
2122
// Arrange
2223
const expectedState = 'Draft';
2324
const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
@@ -87,7 +88,7 @@ test('can publish content with the document link', async ({umbracoApi, umbracoUi
8788
await umbracoUi.content.clickSaveAndPublishButton();
8889

8990
// Assert
90-
//await umbracoUi.content.doesSuccessNotificationsHaveCount(2);
91+
//await umbracoUi.content.doesSuccessNotificationsHaveCount(2);
9192
await umbracoUi.content.isErrorNotificationVisible(false);
9293
expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy();
9394
const contentData = await umbracoApi.document.getByName(contentName);

0 commit comments

Comments
 (0)