From c728a0ad460bbec62fbf0a056e5a025da0d02ced Mon Sep 17 00:00:00 2001 From: Vadim Stepanov Date: Wed, 7 Aug 2024 11:51:44 +0100 Subject: [PATCH 1/3] Fix e2e test (#4785) SMS message text was changed in https://github.com/grafana/oncall/pull/4624 --- grafana-plugin/e2e-tests/alerts/sms.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grafana-plugin/e2e-tests/alerts/sms.test.ts b/grafana-plugin/e2e-tests/alerts/sms.test.ts index 6c6576110a..97caa4f8dd 100644 --- a/grafana-plugin/e2e-tests/alerts/sms.test.ts +++ b/grafana-plugin/e2e-tests/alerts/sms.test.ts @@ -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'); }); From f7838761663aa7abb55fe018c9777645af216397 Mon Sep 17 00:00:00 2001 From: Vadim Stepanov Date: Wed, 7 Aug 2024 13:08:12 +0100 Subject: [PATCH 2/3] Fix e2e test (#4786) https://github.com/grafana/oncall/pull/4785 continued --- grafana-plugin/e2e-tests/utils/phone.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grafana-plugin/e2e-tests/utils/phone.ts b/grafana-plugin/e2e-tests/utils/phone.ts index 765687a452..4da469547b 100644 --- a/grafana-plugin/e2e-tests/utils/phone.ts +++ b/grafana-plugin/e2e-tests/utils/phone.ts @@ -38,7 +38,7 @@ export const waitForSms = async (): Promise => { // 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; From fbd68b10f33d267c8e5c9c97ffbde1ecb5bd9241 Mon Sep 17 00:00:00 2001 From: Vadim Stepanov Date: Wed, 7 Aug 2024 14:19:35 +0100 Subject: [PATCH 3/3] Fix e2e test (#4787) #4785 and #4786 continued --- .github/workflows/expensive-e2e-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/expensive-e2e-tests.yml b/.github/workflows/expensive-e2e-tests.yml index 16090caf91..6e8af9448e 100644 --- a/.github/workflows/expensive-e2e-tests.yml +++ b/.github/workflows/expensive-e2e-tests.yml @@ -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 }}