E2E: migrate to playwright (#107241)

* separate playwright into its own folder * better separation * add login scenario, add tags * remove ui option * update CODEOWNERS * add a panels suite test * migrate queries test to playwright * rename + add dashlist test * add panelEdit_base * add geomap map controls test * add geomap-layer-types * add geomap-spatial-operations tests * add frontend-sandbox-panel tests * add smoke-tests-suite * add comment about adding datasource * add dashboard-browse-nested * add dashboard-browse * add dashboard-export-json * add dashboard-keybindings test * remove @wip tag * turn on screenshots and add comment for why this test fails * add dashboard-links-without-slug test * try adding permissions in the test as well * add dashboard-live-streaming * context in the test doesn't work - sad * create dashboard-public-templating * add dashboard-public-create and make live streaming more resilient * add share externally test * add dashboard-share-internally * add share-snapshot-create test * add dashboard-templating * add timepicker tests * add embedded-dashboard test * add general_dashboards test * add import-dashboard test * add load-options-from-url test * add new-constant-variable test * add custom-variable test * add new-datasource-variable test * add new-interval-variable test * add text-box-variable test * add new-query-variable test * add horizontal repeat test * add panel-vertical-repeat test * add empty-row-repeat test * add set-options-from-ui test * add snapshot-create test * add templating test * add textbox-variables test * add cloud-plugins-suite * add storybook verification tests * add playwright storybook verification workflow * add playwright browsers * update CODEOWNERS * test change to trigger storybook verification workflows * try container instead * get the version right... * go back to installing - less chance of forgetting to update * Basic Github Actions Squashed commit of the following: commit f84c650a71 Author: joshhunt <josh.hunt@grafana.com> Date: Tue Jul 1 13:23:46 2025 +0100 add arg for sharding, but not using it yet commit 7bcf0512c6 Author: joshhunt <josh.hunt@grafana.com> Date: Tue Jul 1 12:30:30 2025 +0100 less newline commit b643911882 Author: joshhunt <josh.hunt@grafana.com> Date: Tue Jul 1 12:24:31 2025 +0100 less logs commit 38f871e9c2 Author: joshhunt <josh.hunt@grafana.com> Date: Tue Jul 1 10:00:26 2025 +0100 fix yaml commit db9a773136 Author: joshhunt <josh.hunt@grafana.com> Date: Tue Jul 1 09:57:47 2025 +0100 clean up files commit c0525f41fa Author: joshhunt <josh.hunt@grafana.com> Date: Tue Jul 1 09:44:56 2025 +0100 gha workflow commit 895bea7c52 Author: joshhunt <josh.hunt@grafana.com> Date: Mon Jun 30 19:33:08 2025 +0100 working dagger commit cea1f84437 Author: joshhunt <josh.hunt@grafana.com> Date: Mon Jun 30 16:17:46 2025 +0100 wip * shard gha * some tidy up * add flags for exporting results, and a gha step to merge runs * fix shard gha * add dashboard-duplicate-panel test * add dashboard-outline test * add dashboards-add-panel * remove some commented out code * add dashboards-title-description test * add dashboards-remove-panel * don't install cypress * gha: check playwright results * add dashboards-edit-adhoc-variables test * fix check-jobs * add dagger cloud token * add dagger cloud token * add edit-datasource-variable test * update CODEOWNERS * add dashboards-edit-group-by-variables (skipped for now) * add dashboards-edit-panel-title-description test * add dashboards-edit-transparent-bg test * add dashboards-edit-query-variables test * run with 8 shards * add dashboards-edit-variables * tidy up gha * add dashboard-group-panels * fix action * try to cache the grafana build * fix missing action becuase no checkout, use builtin continue-on-error instead * fix missing id * cat out.txt * debug build cache * fix debug build cache * add dashboards-panel-layouts test * tidy up * no more debug * fix grafana dir * add dashboards-move-panel test * skip some failing tests * mark up plugins tests with @plugins tag, only run @plugins tests in drone * Hackathon/Playwright Conversion - Various Suite (#107516) * Playwright Migration: Various Suite tests * skipping bad tests * fix some tests that can fail * fix uid * separate user for the verify-i18n test * build test plugins for grafana server * properly blur input fields * login manually * get dashboardPage from goto * ignore a couple of type assertions * remove a couple of timeouts * remove timeouts on dashboard-share-internally * use toBeHidden * make dashboard-share-internally more stable * remove TEMP_DAGGER_TOKEN * clean up visaulization-suggestions * unskip gauge test * unskip trace-view-scrolling * attempt to make create variable utils stable * unskip loki tests * make go linter happy * unskip edit-group-by-variables test * unskip move panel tests * isolate dashboard-timepicker tests with separate user * create data source as part of smoke test * make sure we're awaiting in dashboard-edit-adhoc-variables * make dashboards-edit-variables test more robust * Hackathon Playwright: Dashboards Search (#107580) * Hackathon Playwright: Dashboards Search * Feedback changes * make trace-view-scrolling more stable * add json report and bench step * fix bench version * move fail step to after the playwright report so we can report test failures * fix output file name * fix typo * try wrap in expect.poll * stability * bit more tidy up * fix dashboard-new-layouts tests * move test-plugins to e2e-playwright * fix go code for drone e2e run * move loki plugin-e2e test * make v2 dashboards work again --------- Co-authored-by: joshhunt <josh.hunt@grafana.com> Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com> Co-authored-by: Collin Fingar <collin.fingar@grafana.com> Co-authored-by: Jeff Levin <jeff@levinology.com>
2025-07-11 10:31:33 +01:00
parent ea0ddb3fc9
commit b6580ccb10
250 changed files with 22677 additions and 1038 deletions
@@ -91,7 +91,7 @@ func run(ctx context.Context, cmd *cli.Command) error {
 	hostSrc := d.Host().Directory(grafanaDir, dagger.HostDirectoryOpts{
 		Include: []string{
 			"./devenv",
-			"./e2e/test-plugins", // Directory is included so provisioning works, but they're not actually build
+			"./e2e-playwright/test-plugins", // Directory is included so provisioning works, but they're not actually build
 			"./scripts/grafana-server/custom.ini",
 			"./scripts/grafana-server/start-server",
 			"./scripts/grafana-server/kill-server",
@@ -22,7 +22,7 @@ func GrafanaService(ctx context.Context, d *dagger.Client, opts GrafanaServiceOp
 		WithExec([]string{"mkdir", "-p", "/src/grafana"}).
 		WithExec([]string{"tar", "--strip-components=1", "-xzf", "/src/grafana.tar.gz", "-C", "/src/grafana"}).
 		WithDirectory("/src/grafana/devenv", opts.HostSrc.Directory("./devenv")).
-		WithDirectory("/src/grafana/e2e/test-plugins", opts.HostSrc.Directory("./e2e/test-plugins")).
+		WithDirectory("/src/grafana/e2e-playwright/test-plugins", opts.HostSrc.Directory("./e2e-playwright/test-plugins")).
 		WithDirectory("/src/grafana/scripts", opts.HostSrc.Directory("./scripts")).
 		WithWorkdir("/src/grafana").
 		WithEnvVariable("GF_APP_MODE", "development").
@@ -0,0 +1,22 @@
+# Pa11y accessability tests
+
+We use pa11y to run some automated simple accessability tests. They're ran with dagger to help orchestrate starting server + tests in a reproducable manner.
+
+To run the tests locally:
+
+1. Install dagger locally https://docs.dagger.io/install/
+2. Grab the grafana.tar.gz artifact by either
+   1. Downloading it from the Github Action artifact from your PR
+   1. Build it locally with:
+      ```sh
+      dagger run go run ./pkg/build/cmd artifacts -a targz:grafana:linux/amd64 --grafana-dir="$PWD" > dist/files.txt
+      cat dist/files.txt # Will output the path to the grafana.tar.gz 
+      ```
+3. Run the dagger pipeline with:
+   ```sh
+   dagger -v run go run ./pkg/build/a11y --package=(full path to .tar.gz) --results=./pa11y-ci-results.json
+   ```
+   The JSON results file will be saved to the file from the `--results` arg 
+4. If they fail and you want to see the full output
+   1. Run the dagger command with `dagger -vE [...]`
+   2. At the end, arrow up to the exec pa11y-ci segment and hit Enter
@@ -0,0 +1,101 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"strings"
+
+	"dagger.io/dagger"
+)
+
+var (
+	// Locations in the container to write results to
+	testResultsDir = "/playwright-test-results"
+	htmlResultsDir = "/playwright-html-report"
+	blobResultsDir = "/playwright-blob-report"
+)
+
+type RunTestOpts struct {
+	GrafanaService       *dagger.Service
+	FrontendContainer    *dagger.Container
+	HostSrc              *dagger.Directory
+	Shard                string
+	HTMLReportExportDir  string
+	BlobReportExportDir  string
+	TestResultsExportDir string
+}
+
+func RunTest(
+	ctx context.Context,
+	d *dagger.Client,
+	opts RunTestOpts,
+) (*dagger.Container, error) {
+	playwrightCommand := buildPlaywrightCommand(opts)
+
+	e2eContainer := opts.FrontendContainer.
+		WithWorkdir("/src").
+		WithDirectory("/src", opts.HostSrc).
+		WithMountedCache(".nx", d.CacheVolume("nx-cache")).
+		WithEnvVariable("HOST", grafanaHost).
+		WithEnvVariable("PORT", fmt.Sprint(grafanaPort)).
+		WithServiceBinding(grafanaHost, opts.GrafanaService).
+		WithEnvVariable("bustcache", "1").
+		WithEnvVariable("PLAYWRIGHT_HTML_OPEN", "never").
+		WithEnvVariable("PLAYWRIGHT_HTML_OUTPUT_DIR", htmlResultsDir).
+		WithEnvVariable("PLAYWRIGHT_BLOB_OUTPUT_DIR", blobResultsDir).
+		WithExec(playwrightCommand, dagger.ContainerWithExecOpts{
+			Expect: dagger.ReturnTypeAny,
+		})
+
+	if opts.TestResultsExportDir != "" {
+		_, err := e2eContainer.Directory(testResultsDir).Export(ctx, opts.TestResultsExportDir)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if opts.HTMLReportExportDir != "" {
+		_, err := e2eContainer.Directory(htmlResultsDir).Export(ctx, opts.HTMLReportExportDir)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if opts.BlobReportExportDir != "" {
+		_, err := e2eContainer.Directory(blobResultsDir).Export(ctx, opts.BlobReportExportDir)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return e2eContainer, nil
+}
+
+func buildPlaywrightCommand(opts RunTestOpts) []string {
+	playwrightReporters := []string{
+		"dot", // minimal output in shards
+	}
+
+	if opts.HTMLReportExportDir != "" {
+		playwrightReporters = append(playwrightReporters, "html")
+	}
+
+	if opts.BlobReportExportDir != "" {
+		playwrightReporters = append(playwrightReporters, "blob")
+	}
+
+	playwrightCommand := []string{
+		"yarn",
+		"e2e:playwright",
+		"--reporter",
+		strings.Join(playwrightReporters, ","),
+		"--output",
+		testResultsDir,
+	}
+
+	if opts.Shard != "" {
+		playwrightCommand = append(playwrightCommand, "--shard", opts.Shard)
+	}
+
+	return playwrightCommand
+}
@@ -0,0 +1,84 @@
+package main
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"strings"
+
+	"dagger.io/dagger"
+)
+
+type Deps struct {
+	NodeVersion       string
+	PlaywrightVersion string
+}
+
+// Create a container with frontend dependencies installed, ready to build plugins
+// or run e2e tests.
+// Theoretically we would setup Playwright in e2e.go, but to optimise layer caching
+// we want it to happen before yarn install.
+func WithFrontendContainer(ctx context.Context, d *dagger.Client, yarnHostSrc *dagger.Directory) (*dagger.Container, error) {
+	deps, err := GetVersions(ctx, yarnHostSrc)
+	if err != nil {
+		return nil, err
+	}
+
+	nodeBase := WithNode(d, deps.NodeVersion)
+	playwrightBase := WithPlaywright(d, nodeBase, deps.PlaywrightVersion)
+
+	return WithYarnInstall(d, playwrightBase, yarnHostSrc), nil
+}
+
+func GetVersions(ctx context.Context, src *dagger.Directory) (Deps, error) {
+	nvmrc, err := src.File(".nvmrc").Contents(ctx)
+	if err != nil {
+		return Deps{}, err
+	}
+	pkgJSON, err := src.File("package.json").Contents(ctx)
+	if err != nil {
+		return Deps{}, err
+	}
+
+	// parse package.json
+	var pkgJson struct {
+		DevDependencies map[string]string `json:"devDependencies"`
+	}
+	if err := json.Unmarshal([]byte(pkgJSON), &pkgJson); err != nil {
+		return Deps{}, err
+	}
+
+	return Deps{
+		NodeVersion:       strings.TrimSpace(strings.TrimPrefix(nvmrc, "v")),
+		PlaywrightVersion: strings.TrimSpace(pkgJson.DevDependencies["@playwright/test"]),
+	}, nil
+}
+
+func WithNode(d *dagger.Client, version string) *dagger.Container {
+	nodeImage := fmt.Sprintf("node:%s-slim", strings.TrimPrefix(version, "v"))
+	return d.Container().From(nodeImage)
+}
+
+func WithPlaywright(d *dagger.Client, base *dagger.Container, version string) *dagger.Container {
+	brCache := d.CacheVolume("playwright-browsers")
+	return base.
+		WithEnvVariable("PLAYWRIGHT_BROWSERS_PATH", "/playwright-cache").
+		WithMountedCache("/playwright-cache", brCache).
+		WithExec([]string{"npx", "-y", "playwright@" + version, "install", "--with-deps"})
+}
+
+func WithYarnInstall(d *dagger.Client, base *dagger.Container, yarnHostSrc *dagger.Directory) *dagger.Container {
+	yarnCache := d.CacheVolume("yarn-cache")
+
+	return base.
+		WithWorkdir("/src").
+		WithMountedCache("/.yarn", yarnCache).
+		WithEnvVariable("YARN_CACHE_FOLDER", "/.yarn").
+		WithEnvVariable("CYPRESS_INSTALL_BINARY", "0"). // Don't download Cypress binaries
+
+		// It's important to copy all files here because the whole src directory is then copied into the test runner container
+		WithDirectory("/src", yarnHostSrc).
+		WithExec([]string{"corepack", "enable"}).
+		WithExec([]string{"corepack", "install"}).
+		WithExec([]string{"yarn", "install", "--immutable"})
+}
@@ -0,0 +1,243 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"os"
+	"os/signal"
+
+	"dagger.io/dagger"
+	"github.com/urfave/cli/v3"
+)
+
+var (
+	grafanaHost = "grafana"
+	grafanaPort = 3001
+)
+
+func main() {
+	ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt)
+	defer cancel()
+
+	if err := NewApp().Run(ctx, os.Args); err != nil {
+		cancel()
+		fmt.Println(err)
+		os.Exit(1)
+	}
+}
+
+func NewApp() *cli.Command {
+	return &cli.Command{
+		Name:  "a11y",
+		Usage: "Run Grafana playwright e2e tests",
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:      "grafana-dir",
+				Usage:     "Path to the grafana/grafana clone directory",
+				Value:     ".",
+				Validator: mustBeDir("grafana-dir", false, false),
+				TakesFile: true,
+			},
+			&cli.StringFlag{
+				Name:      "package",
+				Usage:     "Path to the grafana tar.gz package",
+				Value:     "grafana.tar.gz",
+				Validator: mustBeFile("package", false),
+				TakesFile: true,
+			},
+			&cli.StringFlag{
+				Name:      "license",
+				Usage:     "Path to the Grafana Enterprise license file (optional)",
+				Validator: mustBeFile("license", true),
+				TakesFile: true,
+			},
+			&cli.StringFlag{
+				Name:  "shard",
+				Usage: "Test shard to run. See Playwright docs",
+			},
+			&cli.StringFlag{
+				Name:      "results-dir",
+				Usage:     "Path to the directory to export the playwright test results to (optional)",
+				Validator: mustBeDir("results-dir", true, true),
+			},
+			&cli.StringFlag{
+				Name:      "html-dir",
+				Usage:     "Enables the HTML reporter, exported to this directory (optional)",
+				Validator: mustBeDir("html-dir", true, true),
+			},
+			&cli.StringFlag{
+				Name:      "blob-dir",
+				Usage:     "Enables the blob reporter, exported to this directory. Useful with --shard (optional)",
+				Validator: mustBeDir("blob-dir", true, true),
+			},
+		},
+		Action: run,
+	}
+}
+
+func run(ctx context.Context, cmd *cli.Command) error {
+	grafanaDir := cmd.String("grafana-dir")
+	targzPath := cmd.String("package")
+	licensePath := cmd.String("license")
+	pwShard := cmd.String("shard")
+	resultsDir := cmd.String("results-dir")
+	htmlDir := cmd.String("html-dir")
+	blobDir := cmd.String("blob-dir")
+	// pa11yConfigPath := cmd.String("config")
+	// pa11yResultsPath := cmd.String("results")
+	// noThresholdFail := cmd.Bool("no-threshold-fail")
+
+	d, err := dagger.Connect(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to connect to Dagger: %w", err)
+	}
+
+	// Explicitly only the files used by the grafana-server service
+	grafanaHostSrc := d.Host().Directory(grafanaDir, dagger.HostDirectoryOpts{
+		Include: []string{
+			"./devenv",
+
+			// Must build test plugins to run e2e tests
+			"./e2e-playwright/test-plugins",
+			"./packages/grafana-plugin-configs",
+
+			"./scripts/grafana-server/custom.ini",
+			"./scripts/grafana-server/start-server",
+			"./scripts/grafana-server/kill-server",
+			"./scripts/grafana-server/variables",
+		},
+	})
+
+	// Minimal files needed to run yarn install
+	yarnHostSrc := d.Host().Directory(grafanaDir, dagger.HostDirectoryOpts{
+		Include: []string{
+			"package.json",
+			"yarn.lock",
+			".yarnrc.yml",
+			".yarn",
+			"packages/*/package.json",
+			"packages/grafana-plugin-configs",
+			"public/app/plugins/*/*/package.json",
+			"e2e-playwright/test-plugins/*/package.json",
+			".nvmrc",
+		},
+	})
+
+	// Files needed to run e2e tests. yarnHostSrc will be copied into the test runner container as well.
+	e2eHostSrc := d.Host().Directory(".", dagger.HostDirectoryOpts{
+		Include: []string{
+			"public/app/types/*.d.ts",
+			"public/app/core/icons/cached.json",
+
+			// packages we use in playwright tests
+			"packages",           // TODO: do we need all of this?
+			"public/app/plugins", // TODO: do we need all of this?
+
+			// e2e files
+			"e2e-playwright",
+			"e2e-playwright/test-plugins",
+			"playwright.config.ts",
+		},
+		Exclude: []string{
+			"**/dist",
+		},
+	})
+
+	frontendContainer, err := WithFrontendContainer(ctx, d, yarnHostSrc)
+	if err != nil {
+		return fmt.Errorf("failed to create frontend container: %w", err)
+	}
+
+	targz := d.Host().File(targzPath)
+
+	var license *dagger.File
+	if licensePath != "" {
+		license = d.Host().File(licensePath)
+	}
+
+	svc, err := GrafanaService(ctx, d, GrafanaServiceOpts{
+		HostSrc:           grafanaHostSrc,
+		FrontendContainer: frontendContainer,
+		GrafanaTarGz:      targz,
+		License:           license,
+	})
+	if err != nil {
+		return fmt.Errorf("failed to create Grafana service: %w", err)
+	}
+
+	runOpts := RunTestOpts{
+		GrafanaService:       svc,
+		FrontendContainer:    frontendContainer,
+		HostSrc:              e2eHostSrc,
+		Shard:                pwShard,
+		TestResultsExportDir: resultsDir,
+		HTMLReportExportDir:  htmlDir,
+		BlobReportExportDir:  blobDir,
+	}
+
+	c, runErr := RunTest(ctx, d, runOpts)
+	if runErr != nil {
+		return fmt.Errorf("failed to run e2e test suite: %w", runErr)
+	}
+
+	c, syncErr := c.Sync(ctx)
+	if syncErr != nil {
+		return fmt.Errorf("failed to sync e2e test suite: %w", syncErr)
+	}
+
+	code, codeErr := c.ExitCode(ctx)
+	if codeErr != nil {
+		return fmt.Errorf("failed to get exit code of e2e test suite: %w", codeErr)
+	}
+
+	if code == 0 {
+		log.Printf("e2e tests passed with exit code %d", code)
+	} else {
+		return fmt.Errorf("e2e tests failed with exit code %d", code)
+	}
+
+	log.Println("e2e tests completed successfully")
+	return nil
+}
+
+func mustBeFile(arg string, emptyOk bool) func(string) error {
+	return func(s string) error {
+		if s == "" {
+			if emptyOk {
+				return nil
+			}
+			return cli.Exit(arg+" cannot be empty", 1)
+		}
+		stat, err := os.Stat(s)
+		if err != nil {
+			return cli.Exit(arg+" does not exist or cannot be read: "+s, 1)
+		}
+		if stat.IsDir() {
+			return cli.Exit(arg+" must be a file, not a directory: "+s, 1)
+		}
+		return nil
+	}
+}
+
+func mustBeDir(arg string, emptyOk bool, notExistOk bool) func(string) error {
+	return func(s string) error {
+		if s == "" {
+			if emptyOk {
+				return nil
+			}
+			return cli.Exit(arg+" cannot be empty", 1)
+		}
+		stat, err := os.Stat(s)
+		if err != nil {
+			if notExistOk {
+				return nil
+			}
+			return cli.Exit(arg+" does not exist or cannot be read: "+s, 1)
+		}
+		if !stat.IsDir() {
+			return cli.Exit(arg+" must be a directory: "+s, 1)
+		}
+		return nil
+	}
+}
@@ -0,0 +1,58 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"strings"
+
+	"dagger.io/dagger"
+)
+
+type GrafanaServiceOpts struct {
+	HostSrc           *dagger.Directory
+	FrontendContainer *dagger.Container
+	GrafanaTarGz      *dagger.File
+	License           *dagger.File
+}
+
+func GrafanaService(ctx context.Context, d *dagger.Client, opts GrafanaServiceOpts) (*dagger.Service, error) {
+	testPlugins := opts.FrontendContainer.
+		WithDirectory("e2e-playwright/test-plugins", opts.HostSrc.Directory("./e2e-playwright/test-plugins")).
+		WithDirectory("packages/grafana-plugin-configs", opts.HostSrc.Directory("./packages/grafana-plugin-configs")).
+		WithExec([]string{"yarn", "e2e:plugin:build"})
+
+	container := d.Container().From("alpine:3").
+		WithExec([]string{"apk", "add", "--no-cache", "bash", "tar", "netcat-openbsd", "util-linux"}).
+		WithMountedFile("/src/grafana.tar.gz", opts.GrafanaTarGz).
+		WithExec([]string{"mkdir", "-p", "/src/grafana"}).
+		WithExec([]string{"tar", "--strip-components=1", "-xzf", "/src/grafana.tar.gz", "-C", "/src/grafana"}).
+		WithDirectory("/src/grafana/devenv", opts.HostSrc.Directory("./devenv")).
+		WithDirectory("/src/grafana/e2e-playwright/test-plugins", testPlugins.Directory("./e2e-playwright/test-plugins")).
+		WithDirectory("/src/grafana/scripts", opts.HostSrc.Directory("./scripts")).
+		WithWorkdir("/src/grafana").
+		// Only set config variables here that are specific to the dagger/GHA runner.
+		// Prefer to configure scripts/grafana-server/custom.ini instead so they're also used
+		// when running locally.
+		WithEnvVariable("GF_SERVER_HTTP_PORT", fmt.Sprint(grafanaPort)).
+		WithExposedPort(grafanaPort)
+
+	var licenseArg string
+	if opts.License != nil {
+		licenseArg = "/src/license.jwt"
+		container = container.WithMountedFile(licenseArg, opts.License)
+	}
+
+	// We add all GF_ environment variables to allow for overriding Grafana configuration.
+	// It is unlikely the runner has any such otherwise.
+	for _, env := range os.Environ() {
+		if strings.HasPrefix(env, "GF_") {
+			parts := strings.SplitN(env, "=", 2)
+			container = container.WithEnvVariable(parts[0], parts[1])
+		}
+	}
+
+	svc := container.AsService(dagger.ContainerAsServiceOpts{Args: []string{"bash", "scripts/grafana-server/start-server", licenseArg}})
+
+	return svc, nil
+}
@@ -82,6 +82,7 @@ func GrafanaService(ctx context.Context, d *dagger.Client, opts GrafanaServiceOp
 		WithExec([]string{"tar", "--strip-components=1", "-xzf", "/src/grafana.tar.gz", "-C", "/src/grafana"}).
 		WithDirectory("/src/grafana/devenv", src.Directory("/src/devenv")).
 		WithDirectory("/src/grafana/e2e", src.Directory("/src/e2e")).
+		WithDirectory("/src/grafana/e2e-playwright/test-plugins", src.Directory("/src/e2e-playwright/test-plugins")).
 		WithDirectory("/src/grafana/scripts", src.Directory("/src/scripts")).
 		WithDirectory("/src/grafana/tools", src.Directory("/src/tools")).
 		WithWorkdir("/src/grafana").