[v10.4.x] Azure: Update resource group (#88765)

Azure: Update resource group (#88690)

Update azure e2e tests

(cherry picked from commit 17f03882d4)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
This commit is contained in:
grafana-delivery-bot[bot]
2024-06-05 16:47:04 +03:00
committed by GitHub
co-authored by Andreas Christou
parent 4a20bb264a
commit 3f351af597
3 changed files with 6 additions and 6 deletions
+3 -3
View File
@@ -643,7 +643,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:
@@ -1919,7 +1919,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:
@@ -4804,6 +4804,6 @@ kind: secret
name: gcr_credentials
---
kind: signature
hmac: b1c831a3c15c88568802e740cb6bd7af820ce4425d822f4723d5d8e6370a9921
hmac: 6700a01aee4d53ae4b8e7514bb1ba0623960afaa0edc26660f1a3259fdcc05f0
...
@@ -221,7 +221,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 });
},
@@ -280,7 +280,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()
+1 -1
View File
@@ -776,7 +776,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",
],