Skip to content
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.

Sign up for GitHub

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

PMM-7 Update docker compose file & UI tests pipeline fix #755

Merged
merged 5 commits into from
Sep 10, 2024
+8 −4
Merged

PMM-7 Update docker compose file & UI tests pipeline fix #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8318d3e
PMM-7 Update env variable names
matejkubinec Jun 5, 2024
17bde62
PMM-7 Allow specifying pmm server image through env variable
matejkubinec Jun 10, 2024
3eea1e4
Merge branch 'v3' into PMM-7-env-variables
matejkubinec Sep 4, 2024
6ee1312
PMM-7 UI tests pipeline fix (#769)
matejkubinec Aug 23, 2024
5727af8
PMM-7 Install playwright for UI tests
matejkubinec Sep 4, 2024
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
4 changes: 4 additions & 0 deletions .github/workflows/ui-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ jobs:
working-directory: ./pmm-ui-tests
run: npm install

- name: install playwright
working-directory: ./pmm-ui-tests
run: npx playwright install

- name: Run UI tests
working-directory: ./pmm-ui-tests
run: npm run e2e:grafana-pr
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ run-frontend: deps-js ## Fetch js dependencies and watch frontend for rebuild

run-local-env: ## Start local frontend with pmm-server:dev-latest
yarn dev
docker-compose up -d
docker compose up -d

##@ Testing

Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
container_name: pmm-server
# Temporary till we have arm builds
platform: linux/amd64
image: perconalab/pmm-server:3-dev-container
image: ${PMM_SERVER_IMAGE:-perconalab/pmm-server:3-dev-container}
volumes:
- "./:/workspace"
- "./public:/usr/share/grafana/public"
Expand All @@ -16,8 +16,8 @@ services:
environment:
- PMM_DEBUG=1
- PERCONA_PORTAL_URL=https://portal-dev.percona.com
- PERCONA_TEST_PLATFORM_ADDRESS=https://check-dev.percona.com:443
- PERCONA_TEST_PLATFORM_PUBLIC_KEY=RWTkF7Snv08FCboTne4djQfN5qbrLfAjb8SY3/wwEP+X5nUrkxCEvUDJ
- PMM_DEV_PERCONA_PLATFORM_ADDRESS=https://check-dev.percona.com:443
- PMM_DEV_PERCONA_PLATFORM_PUBLIC_KEY=RWTkF7Snv08FCboTne4djQfN5qbrLfAjb8SY3/wwEP+X5nUrkxCEvUDJ

mysql:
image: percona:5.7.30
Expand Down
Loading