mirror of
https://github.com/grafana/grafana.git
synced 2025-07-29 23:32:30 +08:00

* 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 f84c650a71bba339da7f96303292717569d4caa6 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 7bcf0512c6652e079757e7f892d1802eb255a6a7 Author: joshhunt <josh.hunt@grafana.com> Date: Tue Jul 1 12:30:30 2025 +0100 less newline commit b6439118829a09a4c8c49d7692d38df0dff7e7ae Author: joshhunt <josh.hunt@grafana.com> Date: Tue Jul 1 12:24:31 2025 +0100 less logs commit 38f871e9c235344f12ef31121fdfced549c5323c Author: joshhunt <josh.hunt@grafana.com> Date: Tue Jul 1 10:00:26 2025 +0100 fix yaml commit db9a773136eff40a82beb3b2f55f73ab0d07a717 Author: joshhunt <josh.hunt@grafana.com> Date: Tue Jul 1 09:57:47 2025 +0100 clean up files commit c0525f41fa8b498f2fdf71b5047301b0e2945498 Author: joshhunt <josh.hunt@grafana.com> Date: Tue Jul 1 09:44:56 2025 +0100 gha workflow commit 895bea7c527bfbb148a421b9283fa0805f6ab11d Author: joshhunt <josh.hunt@grafana.com> Date: Mon Jun 30 19:33:08 2025 +0100 working dagger commit cea1f8443738e9e4b375c065dd4a1e466036bb74 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>
85 lines
2.6 KiB
Go
85 lines
2.6 KiB
Go
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"})
|
|
}
|