From 17637cea7c6475e1c0361281def001678038381f Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Thu, 22 Dec 2022 11:50:24 +0000
Subject: [PATCH] AzureMonitor: E2E update (#60624) (#60642)

* Wait for locations call to complete

* Update drone to run cloud suite on tests update

(cherry picked from commit 036703610822907a75ca8b61409c231c30c53abb)

# Conflicts:
#	.drone.yml
#	scripts/drone/steps/lib.star
---
 .drone.yml                                    | 4 +++-
 e2e/cloud-plugins-suite/azure-monitor.spec.ts | 5 ++++-
 scripts/drone/steps/lib.star                  | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 9c92617f58e..a447cbf75a4 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -530,6 +530,7 @@ steps:
       include:
       - pkg/tsdb/azuremonitor/**
       - public/app/plugins/datasource/grafana-azure-monitor-datasource/**
+      - e2e/cloud-plugins-suite/azure-monitor.spec.ts
     repo:
     - grafana/grafana
 - commands:
@@ -1369,6 +1370,7 @@ steps:
       include:
       - pkg/tsdb/azuremonitor/**
       - public/app/plugins/datasource/grafana-azure-monitor-datasource/**
+      - e2e/cloud-plugins-suite/azure-monitor.spec.ts
     repo:
     - grafana/grafana
 - commands:
@@ -5634,6 +5636,6 @@ kind: secret
 name: packages_secret_access_key
 ---
 kind: signature
-hmac: c2c81ccb90eff41fcf2929631f42c7d81d1d6b9965a39320be9f6da55128d2dd
+hmac: 084dec78e28944e2273112134abb20eca32c94fa3bcc97687a7a6646b44cb602
 
 ...
diff --git a/e2e/cloud-plugins-suite/azure-monitor.spec.ts b/e2e/cloud-plugins-suite/azure-monitor.spec.ts
index 351c8fb8759..296e6016764 100644
--- a/e2e/cloud-plugins-suite/azure-monitor.spec.ts
+++ b/e2e/cloud-plugins-suite/azure-monitor.spec.ts
@@ -140,11 +140,14 @@ e2e.scenario({
         zone: 'Coordinated Universal Time',
       },
     });
+    e2e()
+      .intercept(/locations/)
+      .as('locations');
     e2e.flows.addPanel({
       dataSourceName,
       visitDashboardAtStart: false,
       queriesForm: () => {
-        e2eSelectors.queryEditor.resourcePicker.select.button().click();
+        e2eSelectors.queryEditor.resourcePicker.select.button().click().wait('@locations');
         e2eSelectors.queryEditor.resourcePicker.search
           .input()
           .wait(100)
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 14d09dd5fa7..c4de80bdfd6 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -741,7 +741,8 @@ def cloud_plugins_e2e_tests_step(suite, edition, cloud, port=3001, video="false"
         when= dict(when, paths={
                 'include' : [
                     'pkg/tsdb/azuremonitor/**',
-                    'public/app/plugins/datasource/grafana-azure-monitor-datasource/**'
+                    'public/app/plugins/datasource/grafana-azure-monitor-datasource/**',
+                    'e2e/cloud-plugins-suite/azure-monitor.spec.ts',
                 ]
             })
     branch = "${DRONE_SOURCE_BRANCH}".replace("/", "-")