From d6a259f110e2d2cad2f6766b43ddcc59e8bf25ff Mon Sep 17 00:00:00 2001 From: Andreas Christou Date: Wed, 5 Jun 2024 15:35:09 +0100 Subject: [PATCH] Azure: Update e2e image (#88778) * Update e2e image * Comment for testing --- .drone.yml | 6 +++--- e2e/cloud-plugins-suite/azure-monitor.spec.ts | 1 + scripts/drone/steps/lib.star | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 0d7f1058b26..17fae172cb1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -642,7 +642,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.10.0:1.0.0 name: end-to-end-tests-cloud-plugins-suite-azure when: paths: @@ -1966,7 +1966,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.10.0:1.0.0 name: end-to-end-tests-cloud-plugins-suite-azure when: paths: @@ -4911,6 +4911,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: a42d3a98c82801fb2f38dfe5fb18d9c0637a57130dc5c171a3701dde4c6bbe9a +hmac: 08b57187429b046e3d98cbb010ce0b632b678e9b6964beb11005e22184e0232c ... diff --git a/e2e/cloud-plugins-suite/azure-monitor.spec.ts b/e2e/cloud-plugins-suite/azure-monitor.spec.ts index 65c1e9f8142..1c7e03d3fa5 100644 --- a/e2e/cloud-plugins-suite/azure-monitor.spec.ts +++ b/e2e/cloud-plugins-suite/azure-monitor.spec.ts @@ -68,6 +68,7 @@ function provisionAzureMonitorDatasources(datasources: AzureMonitorProvision[]) }); } +// Helper function to add template variables const addAzureMonitorVariable = ( name: string, type: AzureQueryType, diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index a4093b5d52d..254920eb9f6 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -831,7 +831,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.10.0:1.0.0", "depends_on": [ "grafana-server", ],