Merge pull request #4788 from grafana/dev

dev to main

Author: vstpme

.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 }}

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');
 });

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

@@ -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;