Skip to content

Commit 6d8cb8c

Browse files
authored
feat(ci): support react image in e2e matrix (#496)
1 parent f601916 commit 6d8cb8c

4 files changed

Lines changed: 25 additions & 2 deletions

File tree

.github/workflows/cd.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,11 @@ on:
119119
type: boolean
120120
required: false
121121
default: false
122+
run-playwright-with-skip-grafana-react-19-preview-image:
123+
description: "Optionally, you can skip the Grafana React 19 preview image"
124+
type: boolean
125+
required: false
126+
default: false
122127
run-playwright-with-version-resolver-type:
123128
description: Define which version resolver type to use for Playwright E2E tests.
124129
type: string
@@ -561,6 +566,7 @@ jobs:
561566
run-playwright-docker: ${{ inputs.run-playwright-docker }}
562567
run-playwright-with-grafana-dependency: ${{ inputs.run-playwright-with-grafana-dependency }}
563568
run-playwright-with-skip-grafana-dev-image: ${{ inputs.run-playwright-with-skip-grafana-dev-image }}
569+
run-playwright-with-skip-grafana-react-19-preview-image: ${{ inputs.run-playwright-with-skip-grafana-react-19-preview-image }}
564570
run-playwright-with-version-resolver-type: ${{ inputs.run-playwright-with-version-resolver-type }}
565571
upload-playwright-artifacts: ${{ inputs.upload-playwright-artifacts }}
566572
playwright-report-path: ${{ inputs.playwright-report-path }}

.github/workflows/ci.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,11 @@ on:
9696
type: boolean
9797
required: false
9898
default: false
99+
run-playwright-with-skip-grafana-react-19-preview-image:
100+
description: Optionally, you can skip the Grafana React 19 preview image
101+
type: boolean
102+
required: false
103+
default: false
99104
run-playwright-with-version-resolver-type:
100105
description: Define which version resolver type to use for Playwright E2E tests.
101106
type: string
@@ -677,6 +682,7 @@ jobs:
677682
plugin-directory: ${{ inputs.plugin-directory }}
678683
grafana-dependency: ${{ inputs.run-playwright-with-grafana-dependency }}
679684
skip-grafana-dev-image: ${{ inputs.run-playwright-with-skip-grafana-dev-image }}
685+
skip-grafana-react-19-preview-image: ${{ inputs.run-playwright-with-skip-grafana-react-19-preview-image }}
680686
version-resolver-type: ${{ inputs.run-playwright-with-version-resolver-type }}
681687
upload-artifacts: ${{ inputs.upload-playwright-artifacts }}
682688
docker-compose-file: ${{ inputs.playwright-docker-compose-file }}
@@ -698,6 +704,7 @@ jobs:
698704
version: ${{ fromJSON(needs.test-and-build.outputs.plugin).version}}
699705
grafana-dependency: ${{ inputs.run-playwright-with-grafana-dependency }}
700706
skip-grafana-dev-image: ${{ inputs.run-playwright-with-skip-grafana-dev-image }}
707+
skip-grafana-react-19-preview-image: ${{ inputs.run-playwright-with-skip-grafana-react-19-preview-image }}
701708
version-resolver-type: ${{ inputs.run-playwright-with-version-resolver-type }}
702709
upload-artifacts: ${{ inputs.upload-playwright-artifacts }}
703710
grafana-compose-file: ${{ inputs.playwright-docker-compose-file }}

.github/workflows/playwright-docker.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ on:
2222
default: false
2323
required: false
2424
type: boolean
25+
skip-grafana-react-19-preview-image:
26+
default: false
27+
required: false
28+
type: boolean
2529
version-resolver-type:
2630
required: false
2731
type: string
@@ -71,9 +75,10 @@ jobs:
7175

7276
- name: Resolve Grafana E2E versions
7377
id: resolve-versions
74-
uses: grafana/plugin-actions/e2e-version@e2e-version/v1.1.2
78+
uses: grafana/plugin-actions/e2e-version@e2e-version/v1.2.0
7579
with:
7680
skip-grafana-dev-image: ${{ inputs.skip-grafana-dev-image }}
81+
skip-grafana-react-19-preview-image: ${{ inputs.skip-grafana-react-19-preview-image }}
7782
version-resolver-type: ${{ inputs.version-resolver-type }}
7883
grafana-dependency: ${{ inputs.grafana-dependency }}
7984

.github/workflows/playwright.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ on:
2525
default: false
2626
required: false
2727
type: boolean
28+
skip-grafana-react-19-preview-image:
29+
default: false
30+
required: false
31+
type: boolean
2832
version-resolver-type:
2933
required: false
3034
type: string
@@ -89,9 +93,10 @@ jobs:
8993

9094
- name: Resolve Grafana E2E versions
9195
id: resolve-versions
92-
uses: grafana/plugin-actions/e2e-version@e2e-version/v1.1.2
96+
uses: grafana/plugin-actions/e2e-version@e2e-version/v1.2.0
9397
with:
9498
skip-grafana-dev-image: ${{ inputs.skip-grafana-dev-image }}
99+
skip-grafana-react-19-preview-image: ${{ inputs.skip-grafana-react-19-preview-image }}
95100
version-resolver-type: ${{ inputs.version-resolver-type }}
96101
grafana-dependency: ${{ inputs.grafana-dependency }}
97102

0 commit comments

Comments
 (0)