diff --git a/.drone.yml b/.drone.yml index 07d7f860e79..5bdf545df46 100644 --- a/.drone.yml +++ b/.drone.yml @@ -632,7 +632,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-9.5.1:1.0.0 name: end-to-end-tests-cloud-plugins-suite-azure when: paths: @@ -1829,7 +1829,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-9.5.1:1.0.0 name: end-to-end-tests-cloud-plugins-suite-azure when: paths: @@ -4607,6 +4607,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 21325b903016a38a2b8f13ce772f9644b2e8cb4e44f7b11499af665015e3cd2c +hmac: 006c79befa5fdfb008b79047e1b4174e4df631d9b77d55021d6195a5bc2ca7ef ... diff --git a/e2e/cloud-plugins-suite/azure-monitor.spec.ts b/e2e/cloud-plugins-suite/azure-monitor.spec.ts index c0f31cfe758..f4ff4eab6f5 100644 --- a/e2e/cloud-plugins-suite/azure-monitor.spec.ts +++ b/e2e/cloud-plugins-suite/azure-monitor.spec.ts @@ -258,7 +258,7 @@ e2e.scenario({ .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 }); }, @@ -321,7 +321,7 @@ e2e.scenario({ 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 0acbf546016..fb26f787b81 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -771,7 +771,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-9.5.1:1.0.0", "depends_on": [ "grafana-server", ],