Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ jobs:

playwright:
name: Playwright E2E tests
uses: grafana/plugin-ci-workflows/.github/workflows/playwright.yml@ci-cd-workflows/v6.1.1
uses: grafana/plugin-ci-workflows/.github/workflows/playwright.yml@feat/e2e-version-plugin-path
if: ${{ inputs.run-playwright == true }}
needs:
- test-and-build
Expand All @@ -703,14 +703,15 @@ jobs:

playwright-docker:
name: Plugins - Dockerized Playwright E2E tests
uses: grafana/plugin-ci-workflows/.github/workflows/playwright-docker.yml@ci-cd-workflows/v6.1.1
uses: grafana/plugin-ci-workflows/.github/workflows/playwright-docker.yml@feat/e2e-version-plugin-path
if: ${{ inputs.run-playwright-docker == true }}
needs:
- test-and-build
with:
id: ${{ fromJSON(needs.test-and-build.outputs.plugin).id}}
version: ${{ fromJSON(needs.test-and-build.outputs.plugin).version}}
grafana-dependency: ${{ inputs.run-playwright-with-grafana-dependency }}
plugin-directory: ${{ inputs.plugin-directory }}
skip-grafana-dev-image: ${{ inputs.run-playwright-with-skip-grafana-dev-image }}
skip-grafana-react-19-preview-image: ${{ inputs.run-playwright-with-skip-grafana-react-19-preview-image }}
version-resolver-type: ${{ inputs.run-playwright-with-version-resolver-type }}
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/playwright-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ on:
grafana-dependency:
required: false
type: string
plugin-directory:
required: false
type: string
description: Path to the plugin root directory containing src/plugin.json. Only used when version-resolver-type is plugin-grafana-dependency and grafana-dependency is not set.
upload-artifacts:
required: false
type: boolean
Expand Down Expand Up @@ -75,12 +79,13 @@ jobs:

- name: Resolve Grafana E2E versions
id: resolve-versions
uses: grafana/plugin-actions/e2e-version@e2e-version/v1.2.1
uses: grafana/plugin-actions/e2e-version@c81db32e08b8b880fc68f758eb60c29673878150 # feat/plugin-path-input (grafana/plugin-actions#212)
with:
skip-grafana-dev-image: ${{ inputs.skip-grafana-dev-image }}
skip-grafana-react-19-preview-image: ${{ inputs.skip-grafana-react-19-preview-image }}
version-resolver-type: ${{ inputs.version-resolver-type }}
grafana-dependency: ${{ inputs.grafana-dependency }}
plugin-directory: ${{ inputs.plugin-directory }}

playwright-tests:
needs: resolve-versions
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,13 @@ jobs:

- name: Resolve Grafana E2E versions
id: resolve-versions
uses: grafana/plugin-actions/e2e-version@e2e-version/v1.2.1
uses: grafana/plugin-actions/e2e-version@c81db32e08b8b880fc68f758eb60c29673878150 # feat/plugin-path-input (grafana/plugin-actions#212)
with:
skip-grafana-dev-image: ${{ inputs.skip-grafana-dev-image }}
skip-grafana-react-19-preview-image: ${{ inputs.skip-grafana-react-19-preview-image }}
version-resolver-type: ${{ inputs.version-resolver-type }}
grafana-dependency: ${{ inputs.grafana-dependency }}
plugin-directory: ${{ inputs.plugin-directory }}

playwright-tests:
needs: resolve-versions
Expand Down