public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v10.2.x] Azure: Update resource group (#88763)

Browse Source 
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:45:11 +03:00
committed by GitHub
co-authored by Andreas Christou
parent cb7518ddb0
commit 0bf424bdb7
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.yml
+3 -3
View File
@@ -637,7 +637,7 @@ steps:
GITHUB_TOKEN: GITHUB_TOKEN:
from_secret: github_token from_secret: github_token
HOST: grafana-server 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 name: end-to-end-tests-cloud-plugins-suite-azure
when: when:
paths: paths:
@@ -1900,7 +1900,7 @@ steps:
GITHUB_TOKEN: GITHUB_TOKEN:
from_secret: github_token from_secret: github_token
HOST: grafana-server 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 name: end-to-end-tests-cloud-plugins-suite-azure
when: when:
paths: paths:
@@ -4676,6 +4676,6 @@ kind: secret
name: gcr_credentials name: gcr_credentials
--- ---
kind: signature kind: signature
hmac: 4b0934103612f1f41dd2b086069ff8c5ad660cc52ed8424b14e49650d3a3ec86 hmac: 2b7963a4e07d91f641600f41964d657cf6583c5f9be79c8229ad367db21101e9
... ...
e2e/cloud-plugins-suite/azure-monitor.spec.ts
+2 -2
View File
@@ -257,7 +257,7 @@ describe('Azure monitor datasource', () => {
.click(); .click();
e2eSelectors.queryEditor.argsQueryEditor.subscriptions.input().find('input').type('datasources{enter}'); e2eSelectors.queryEditor.argsQueryEditor.subscriptions.input().find('input').type('datasources{enter}');
e2e.components.CodeEditor.container().type( 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 }); e2e.components.PanelEditor.toggleTableView().click({ force: true });
}, },
@@ -316,7 +316,7 @@ describe('Azure monitor datasource', () => {
e2e.pages.Dashboard.SubMenu.submenuItemLabels('resourceGroups') e2e.pages.Dashboard.SubMenu.submenuItemLabels('resourceGroups')
.parent() .parent()
.find('input') .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().find('button').click();
e2e.pages.Dashboard.SubMenu.submenuItemLabels('namespaces') e2e.pages.Dashboard.SubMenu.submenuItemLabels('namespaces')
.parent() .parent()
scripts/drone/steps/lib.star
+1 -1
View File
@@ -772,7 +772,7 @@ def cloud_plugins_e2e_tests_step(suite, cloud, trigger = None):
branch = "${DRONE_SOURCE_BRANCH}".replace("/", "-") branch = "${DRONE_SOURCE_BRANCH}".replace("/", "-")
step = { step = {
"name": "end-to-end-tests-{}-{}".format(suite, cloud), "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": [ "depends_on": [
"grafana-server", "grafana-server",
], ],