Skip to content

Commit

Permalink
Merge branch 'main' into hotfix-netpol
Browse files Browse the repository at this point in the history
  • Loading branch information
mjnagel authored Dec 10, 2024
2 parents e89191d + 7370ab1 commit 5d1191c
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 14 deletions.
3 changes: 3 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ Relates to #
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Other (security config, docs update, etc)

## Steps to Validate
- If this PR introduces new functionality to UDS Core or addresses a bug, please document the steps to test the changes.

## Checklist before merging

- [ ] Test, docs, adr added or updated as needed
Expand Down
2 changes: 1 addition & 1 deletion src/grafana/tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ tasks:
- description: E2E Test for Grafana, optionally set FULL_CORE=true to test integrations with Loki
cmd: |
# renovate: datasource=docker depName=mcr.microsoft.com/playwright versioning=docker
docker run --rm --ipc=host -e FULL_CORE="${FULL_CORE}" --net=host --mount type=bind,source="$(pwd)",target=/app mcr.microsoft.com/playwright:v1.49.0-noble sh -c " \
docker run --rm --ipc=host -e FULL_CORE="${FULL_CORE}" --net=host --mount type=bind,source="$(pwd)",target=/app mcr.microsoft.com/playwright:v1.49.1-noble sh -c " \
cd app && \
npm ci && \
npx playwright test grafana.test.ts \
Expand Down
2 changes: 1 addition & 1 deletion src/neuvector/tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ tasks:
- description: E2E Test for NeuVector
cmd: |
# renovate: datasource=docker depName=mcr.microsoft.com/playwright versioning=docker
docker run --rm --ipc=host -e FULL_CORE="${FULL_CORE}" --net=host --mount type=bind,source="$(pwd)",target=/app mcr.microsoft.com/playwright:v1.49.0-noble sh -c " \
docker run --rm --ipc=host -e FULL_CORE="${FULL_CORE}" --net=host --mount type=bind,source="$(pwd)",target=/app mcr.microsoft.com/playwright:v1.49.1-noble sh -c " \
cd app && \
npm ci && \
npx playwright test neuvector.test.ts \
Expand Down
2 changes: 1 addition & 1 deletion tasks/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ tasks:
dir: test/playwright
cmd: |
# renovate: datasource=docker depName=mcr.microsoft.com/playwright versioning=docker
docker run --rm --ipc=host --net=host -e FULL_CORE="true" --mount type=bind,source="$(pwd)",target=/app mcr.microsoft.com/playwright:v1.49.0-noble sh -c " \
docker run --rm --ipc=host --net=host -e FULL_CORE="true" --mount type=bind,source="$(pwd)",target=/app mcr.microsoft.com/playwright:v1.49.1-noble sh -c " \
cd app && \
npm ci && \
npx playwright test \
Expand Down
22 changes: 11 additions & 11 deletions test/playwright/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 5d1191c

Please sign in to comment.