Skip to content

Commit a7c0862

Browse files
authored
Merge pull request #4788 from grafana/dev
dev to main
2 parents 0b038fc + fbd68b1 commit a7c0862

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

.github/workflows/expensive-e2e-tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ jobs:
3030
# - 10.2.4
3131
# - latest
3232
fail-fast: false
33+
# Run one version at a time to avoid the issue when SMS notification are bundled together for multiple versions
34+
# running at the same time (the affected test is in grafana-plugin/e2e-tests/alerts/sms.test.ts)
35+
max-parallel: 1
3336
uses: ./.github/workflows/e2e-tests.yml
3437
with:
3538
grafana_version: ${{ matrix.grafana_version }}

grafana-plugin/e2e-tests/alerts/sms.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ test('we can verify our phone number + receive an SMS alert @expensive', async (
2222
const smsAlertNotification = await waitForSms();
2323

2424
expect(smsAlertNotification).toContain('OnCall');
25-
expect(smsAlertNotification).toContain('alert');
25+
expect(smsAlertNotification).toContain('Alert group');
2626
});

grafana-plugin/e2e-tests/utils/phone.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export const waitForSms = async (): Promise<string> => {
3838
// only start waiting for smses that would've been received after this function has been invoked
3939
since: new Date(),
4040
phoneNumberId: phoneNumber.id,
41-
timeout: 30_000,
41+
timeout: 180_000, // Wait for 3 minutes as SMS notifications are bundled and can take 2+ minutes to arrive
4242
},
4343
});
4444
return sms.body;

0 commit comments

Comments
 (0)