Skip to content

Provisioning: Fix ImportAllPanelsFromLocalRepository test #108441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 22, 2025

Conversation

macabu
Copy link
Contributor

@macabu macabu commented Jul 22, 2025

Examples:

 --- FAIL: TestIntegrationProvisioning_ImportAllPanelsFromLocalRepository (2.06s)
    helper_test.go:230: Grafana is listening on 127.0.0.1:36871
    provisioning_test.go:600: 
        	Error Trace:	/opt/actions-runner/_work/grafana-enterprise/grafana-enterprise/grafana/pkg/tests/apis/provisioning/provisioning_test.go:600
        	Error:      	Not equal: 
        	            	expected: "create"
        	            	actual  : "update"
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -1 +1 @@
        	            	-create
        	            	+update
        	Test:       	TestIntegrationProvisioning_ImportAllPanelsFromLocalRepository
FAIL
FAIL	github.com/grafana/grafana/pkg/tests/apis/provisioning	26.018s
FAIL

.

 --- FAIL: TestIntegrationProvisioning_ImportAllPanelsFromLocalRepository (1.55s)
    helper_test.go:230: Grafana is listening on 127.0.0.1:43541
    provisioning_test.go:605: 
        	Error Trace:	/opt/actions-runner/_work/grafana-enterprise/grafana-enterprise/grafana/pkg/tests/apis/provisioning/provisioning_test.go:605
        	Error:      	An error is expected but got nil.
        	Test:       	TestIntegrationProvisioning_ImportAllPanelsFromLocalRepository
        	Messages:   	no all-panels dashboard should exist
FAIL
FAIL	github.com/grafana/grafana/pkg/tests/apis/provisioning	21.370s
FAIL

@macabu macabu requested a review from a team as a code owner July 22, 2025 10:46
@macabu macabu removed the request for review from a team July 22, 2025 10:46
@macabu macabu added the no-changelog Skip including change in changelog/release notes label Jul 22, 2025
@macabu macabu requested a review from konsalex July 22, 2025 10:46
@github-actions github-actions bot added this to the 12.1.x milestone Jul 22, 2025
@MissingRoberto MissingRoberto self-requested a review July 22, 2025 13:37
Copy link
Contributor

@MissingRoberto MissingRoberto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pushed a commit to fix it. Apologies for the flake

@macabu macabu changed the title Provisioning: Skip flaky test Provisioning: Fix ImportAllPanelsFromLocalRepository test Jul 22, 2025
@macabu macabu enabled auto-merge (squash) July 22, 2025 14:01
@macabu macabu merged commit 0dbede9 into main Jul 22, 2025
98 of 99 checks passed
@macabu macabu deleted the macabu/skip-provisioning-flaky-test branch July 22, 2025 14:23
dprokop added a commit that referenced this pull request Jul 22, 2025
… variable (#108237)

* Schema v2: Introduce group/datasource convention to GroupBy and AdHoc variables

* add conversion

* App Installer: Authorizer support (#108419)

* Chore: use `satisfies` and remove a load of `any`s (#108397)

use satisfies and remove a load of anys

* improve logging and fail unified-storage migration with more than 0 errors (#108471)

improve logging and fail unified-storage migration with more than 0 errors

* fix conversion test

* Secrets: Create more granular fixed roles for SecureValues (#108382)

* Provisioning: Fix bug in job progress recording (#108440)

Fix bug in job progress recording

* Provisioning: Fix ImportAllPanelsFromLocalRepository test (#108441)

* Provisioning: Skip flaky test

* Fix flaky provisioning test

* Fix lint

---------

Co-authored-by: Roberto Jimenez Sanchez <[email protected]>

* BulkDeleteProvisionedResource: Move progress bar into a second step (#108417)

* Move progress bar into a second step

---------

Co-authored-by: Alex Khomenko <[email protected]>

* [Dashboard Schema Codegen] Move dashboard CUE codegen block back up into kind body (#108476)

[Dashboard Schema Codegen] Move dashboard CUE codegen block back up into kind body to make sure new versions have the same settings.

---------

Co-authored-by: Haris Rozajac <[email protected]>
Co-authored-by: Todd Treece <[email protected]>
Co-authored-by: Ashley Harrison <[email protected]>
Co-authored-by: Will Assis <[email protected]>
Co-authored-by: Matheus Macabu <[email protected]>
Co-authored-by: Roberto Jiménez Sánchez <[email protected]>
Co-authored-by: Roberto Jimenez Sanchez <[email protected]>
Co-authored-by: Yunwen Zheng <[email protected]>
Co-authored-by: Alex Khomenko <[email protected]>
Co-authored-by: Austin Pond <[email protected]>
Co-authored-by: Ivan Ortega <[email protected]>
dprokop added a commit that referenced this pull request Jul 30, 2025
* Revert "Revert: Future-proofing query and data source model in Dashboard Sche… (#107985)"

This reverts commit 13a89d4.

* Revert "Revert "Schema V2: Simplify annotations v1<->v2 conversions" (#107984)"

This reverts commit 2b8c5be.

* make gen apps

* e2e update

* Use v2alpha2 by default (#108177)

* Use v2alpha2 by default

* Apply only DS changes to alpha2

* Use v2alpha2 by default except to query

* Create a v2 index in @grafana/schema

* Update path and apply lint

* Update tests

* Update imports to v2 status

* Fix failing openapi test

* Schemav2 breaking changes: conversion implementation (#108224)

* provision v2alpha1 dashboard

* Run conversions for DS refactor

* Run snapshot testing on conversions

* Normalize output name

* Update snapshots to include all panel and variable cases

* fix lint

* fix lint

* fix test and go lint

* more go lint

---------

Co-authored-by: Ivan Ortega <[email protected]>
Co-authored-by: Haris Rozajac <[email protected]>

* Schema v2: Introduce group/datasource convention to GroupBy and AdHoc variable (#108237)

* Schema v2: Introduce group/datasource convention to GroupBy and AdHoc variables

* add conversion

* App Installer: Authorizer support (#108419)

* Chore: use `satisfies` and remove a load of `any`s (#108397)

use satisfies and remove a load of anys

* improve logging and fail unified-storage migration with more than 0 errors (#108471)

improve logging and fail unified-storage migration with more than 0 errors

* fix conversion test

* Secrets: Create more granular fixed roles for SecureValues (#108382)

* Provisioning: Fix bug in job progress recording (#108440)

Fix bug in job progress recording

* Provisioning: Fix ImportAllPanelsFromLocalRepository test (#108441)

* Provisioning: Skip flaky test

* Fix flaky provisioning test

* Fix lint

---------

Co-authored-by: Roberto Jimenez Sanchez <[email protected]>

* BulkDeleteProvisionedResource: Move progress bar into a second step (#108417)

* Move progress bar into a second step

---------

Co-authored-by: Alex Khomenko <[email protected]>

* [Dashboard Schema Codegen] Move dashboard CUE codegen block back up into kind body (#108476)

[Dashboard Schema Codegen] Move dashboard CUE codegen block back up into kind body to make sure new versions have the same settings.

---------

Co-authored-by: Haris Rozajac <[email protected]>
Co-authored-by: Todd Treece <[email protected]>
Co-authored-by: Ashley Harrison <[email protected]>
Co-authored-by: Will Assis <[email protected]>
Co-authored-by: Matheus Macabu <[email protected]>
Co-authored-by: Roberto Jiménez Sánchez <[email protected]>
Co-authored-by: Roberto Jimenez Sanchez <[email protected]>
Co-authored-by: Yunwen Zheng <[email protected]>
Co-authored-by: Alex Khomenko <[email protected]>
Co-authored-by: Austin Pond <[email protected]>
Co-authored-by: Ivan Ortega <[email protected]>

* Dashboard Schema V2: Refactor VizConfigKind to follow DataQueryKind convention (#108148)

* Dashboards API: Register v2alpha2 API

* Prepare conversion functions

* Fix test

* Refactor VizConfigKind to follow DataQueryKind convention

* fix tests

* use new dataquerykind convention alpha 2

* add conversion

* fix tests

* fix tests

* fix another test

* Fix merge

---------

Co-authored-by: Dominik Prokop <[email protected]>

* fix k8s codegen

* Update e2e-playwright/dashboards/TestV2Dashboard.json

* Update e2e/dashboards/TestV2Dashboard.json

* revert app generation for non-related apps

* try again

* another try

* also revert folder and secret app generation

* v2alpha1 provisioned dashboard

* Fix kind

* Fix conversion snapshots

* Update API discovery registry

* Rename to v2beta1

* Rename migrations

* Update apps/dashboard/pkg/apis/dashboard/v2beta1/doc.go

Co-authored-by: Stephanie Hingtgen <[email protected]>

* Ensure conditional rendering and other non changed properties

---------

Co-authored-by: Ivan Ortega <[email protected]>
Co-authored-by: Haris Rozajac <[email protected]>
Co-authored-by: Todd Treece <[email protected]>
Co-authored-by: Ashley Harrison <[email protected]>
Co-authored-by: Will Assis <[email protected]>
Co-authored-by: Matheus Macabu <[email protected]>
Co-authored-by: Roberto Jiménez Sánchez <[email protected]>
Co-authored-by: Roberto Jimenez Sanchez <[email protected]>
Co-authored-by: Yunwen Zheng <[email protected]>
Co-authored-by: Alex Khomenko <[email protected]>
Co-authored-by: Austin Pond <[email protected]>
Co-authored-by: Haris Rozajac <[email protected]>
Co-authored-by: Stephanie Hingtgen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/backend no-changelog Skip including change in changelog/release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants