Skip to content

Commit

Permalink
PMM-7 Update docker compose file & UI tests pipeline fix (#755)
Browse files Browse the repository at this point in the history
* PMM-7 Update env variable names

* PMM-7 Allow specifying pmm server image through env variable

* PMM-7 UI tests pipeline fix (#769)

* PMM-7 Install playwright for UI tests
  • Loading branch information
matejkubinec authored Sep 10, 2024
1 parent 21ca5b7 commit a1642a2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/ui-tests.yml
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
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
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

0 comments on commit a1642a2

Please sign in to comment.