From 0bf424bdb7aea7ba18d932a6229acd178fd9962e Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Wed, 5 Jun 2024 16:45:11 +0300
Subject: [PATCH] [v10.2.x] Azure: Update resource group (#88763)

Azure: Update resource group (#88690)

Update azure e2e tests

(cherry picked from commit 17f03882d4840577ddf933e939408d5923af22bf)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
---
 .drone.yml                                    | 6 +++---
 e2e/cloud-plugins-suite/azure-monitor.spec.ts | 4 ++--
 scripts/drone/steps/lib.star                  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 7948f66e767..bf1a3fe9f27 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -637,7 +637,7 @@ steps:
     GITHUB_TOKEN:
       from_secret: github_token
     HOST: grafana-server
-  image: us-docker.pkg.dev/grafanalabs-dev/cloud-data-sources/e2e:3.0.0
+  image: us-docker.pkg.dev/grafanalabs-dev/cloud-data-sources/e2e-13.1.0:1.0.0
   name: end-to-end-tests-cloud-plugins-suite-azure
   when:
     paths:
@@ -1900,7 +1900,7 @@ steps:
     GITHUB_TOKEN:
       from_secret: github_token
     HOST: grafana-server
-  image: us-docker.pkg.dev/grafanalabs-dev/cloud-data-sources/e2e:3.0.0
+  image: us-docker.pkg.dev/grafanalabs-dev/cloud-data-sources/e2e-13.1.0:1.0.0
   name: end-to-end-tests-cloud-plugins-suite-azure
   when:
     paths:
@@ -4676,6 +4676,6 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
-hmac: 4b0934103612f1f41dd2b086069ff8c5ad660cc52ed8424b14e49650d3a3ec86
+hmac: 2b7963a4e07d91f641600f41964d657cf6583c5f9be79c8229ad367db21101e9
 
 ...
diff --git a/e2e/cloud-plugins-suite/azure-monitor.spec.ts b/e2e/cloud-plugins-suite/azure-monitor.spec.ts
index 4f61c10ce0b..33585e9f0ec 100644
--- a/e2e/cloud-plugins-suite/azure-monitor.spec.ts
+++ b/e2e/cloud-plugins-suite/azure-monitor.spec.ts
@@ -257,7 +257,7 @@ describe('Azure monitor datasource', () => {
           .click();
         e2eSelectors.queryEditor.argsQueryEditor.subscriptions.input().find('input').type('datasources{enter}');
         e2e.components.CodeEditor.container().type(
-          "Resources | where resourceGroup == 'cloud-plugins-e2e-test' | project name, resourceGroup"
+          "Resources | where resourceGroup == 'cloud-plugins-e2e-test-azmon' | project name, resourceGroup"
         );
         e2e.components.PanelEditor.toggleTableView().click({ force: true });
       },
@@ -316,7 +316,7 @@ describe('Azure monitor datasource', () => {
     e2e.pages.Dashboard.SubMenu.submenuItemLabels('resourceGroups')
       .parent()
       .find('input')
-      .type('cloud-plugins-e2e-test{downArrow}{enter}');
+      .type('cloud-plugins-e2e-test-azmon{downArrow}{enter}');
     e2e.pages.Dashboard.SubMenu.submenuItemLabels('namespaces').parent().find('button').click();
     e2e.pages.Dashboard.SubMenu.submenuItemLabels('namespaces')
       .parent()
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 9f9749b9d51..ee06d11ba09 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -772,7 +772,7 @@ def cloud_plugins_e2e_tests_step(suite, cloud, trigger = None):
     branch = "${DRONE_SOURCE_BRANCH}".replace("/", "-")
     step = {
         "name": "end-to-end-tests-{}-{}".format(suite, cloud),
-        "image": "us-docker.pkg.dev/grafanalabs-dev/cloud-data-sources/e2e:3.0.0",
+        "image": "us-docker.pkg.dev/grafanalabs-dev/cloud-data-sources/e2e-13.1.0:1.0.0",
         "depends_on": [
             "grafana-server",
         ],