centralcloud/oncall-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4788 from grafana/dev

Browse source 
dev to main
This commit is contained in:
Vadim Stepanov 2024-08-07 14:57:00 +01:00 • committed by GitHub
commit a7c086273d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/expensive-e2e-tests.yml vendored
View file

@ -30,6 +30,9 @@ jobs:
# - 10.2.4
# - latest
fail-fast: false
# Run one version at a time to avoid the issue when SMS notification are bundled together for multiple versions
# running at the same time (the affected test is in grafana-plugin/e2e-tests/alerts/sms.test.ts)
max-parallel: 1
uses: ./.github/workflows/e2e-tests.yml
with:
grafana_version: ${{ matrix.grafana_version }}

2
grafana-plugin/e2e-tests/alerts/sms.test.ts
View file

@ -22,5 +22,5 @@ test('we can verify our phone number + receive an SMS alert @expensive', async (
const smsAlertNotification = await waitForSms();
expect(smsAlertNotification).toContain('OnCall');
expect(smsAlertNotification).toContain('alert');
expect(smsAlertNotification).toContain('Alert group');
});

2
grafana-plugin/e2e-tests/utils/phone.ts
View file

@ -38,7 +38,7 @@ export const waitForSms = async (): Promise<string> => {
// only start waiting for smses that would've been received after this function has been invoked
since: new Date(),
phoneNumberId: phoneNumber.id,
timeout: 30_000,
timeout: 180_000, // Wait for 3 minutes as SMS notifications are bundled and can take 2+ minutes to arrive
},
});
return sms.body;