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

Revert: Remove unnecessary Alpine/Ubuntu conditional logic

Browse Source 
- Real issue was wrong environment variable name (dashboardScene vs DISABLE_SCENES)
- Keep Ubuntu base (original main branch behavior) for simplicity
- Container base was not the root cause of old arch failures
This commit is contained in:
jev forsberg
2025-07-17 10:58:12 -06:00
parent bed0070362
commit b9b4602dbd
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/pr-e2e-tests.yml
+4 -4
View File
@@ -110,16 +110,16 @@ jobs:
path: e2e/panels-suite path: e2e/panels-suite
- suite: various-suite (old arch) - suite: various-suite (old arch)
path: e2e/old-arch/various-suite path: e2e/old-arch/various-suite
flags: --flags="--env dashboardScene=false" flags: --flags="--env DISABLE_SCENES=true"
- suite: dashboards-suite (old arch) - suite: dashboards-suite (old arch)
path: e2e/old-arch/dashboards-suite path: e2e/old-arch/dashboards-suite
flags: --flags="--env dashboardScene=false" flags: --flags="--env DISABLE_SCENES=true"
- suite: smoke-tests-suite (old arch) - suite: smoke-tests-suite (old arch)
path: e2e/old-arch/smoke-tests-suite path: e2e/old-arch/smoke-tests-suite
flags: --flags="--env dashboardScene=false" flags: --flags="--env DISABLE_SCENES=true"
- suite: panels-suite (old arch) - suite: panels-suite (old arch)
path: e2e/old-arch/panels-suite path: e2e/old-arch/panels-suite
flags: --flags="--env dashboardScene=false" flags: --flags="--env DISABLE_SCENES=true"
name: ${{ matrix.suite }} name: ${{ matrix.suite }}
runs-on: ubuntu-latest-8-cores runs-on: ubuntu-latest-8-cores
permissions: permissions:
pkg/build/e2e/service.go
+2 -11
View File
@@ -74,17 +74,8 @@ func GrafanaService(ctx context.Context, d *dagger.Client, opts GrafanaServiceOp
WithExec([]string{"yarn", "install", "--immutable"}). WithExec([]string{"yarn", "install", "--immutable"}).
WithExec([]string{"yarn", "e2e:plugin:build"}) WithExec([]string{"yarn", "e2e:plugin:build"})
// Conditional container base: Alpine for OSS (better old arch compatibility), Ubuntu for Enterprise (image renderer support) // Ubuntu base for modern daggerbuild system (supports image renderer + glibc requirements)
var container *dagger.Container container := d.Container().From("ubuntu:latest").
if opts.InstallImageRenderer {
// Ubuntu needed for image renderer (Enterprise workflows)
container = d.Container().From("ubuntu:latest")
} else {
// Alpine for OSS - better compatibility with original release-12.0.3 and old arch tests
container = d.Container().From("alpine").WithExec([]string{"apk", "add", "bash"})
}
container = container.
WithMountedFile("/src/grafana.tar.gz", opts.GrafanaTarGz). WithMountedFile("/src/grafana.tar.gz", opts.GrafanaTarGz).
WithExec([]string{"mkdir", "-p", "/src/grafana"}). WithExec([]string{"mkdir", "-p", "/src/grafana"}).
WithExec([]string{"tar", "--strip-components=1", "-xzf", "/src/grafana.tar.gz", "-C", "/src/grafana"}). WithExec([]string{"tar", "--strip-components=1", "-xzf", "/src/grafana.tar.gz", "-C", "/src/grafana"}).