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.

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

Minor suggestions #5

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
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
12 changes: 8 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches: [ main ]

schedule:
- cron: '25 08 * * *'
- cron: '25 08 * * *'

workflow_dispatch:
inputs:
Expand All @@ -15,9 +15,13 @@ on:
required: false
default: false

# This is required for "gautamkrishnar/keepalive-workflow"
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

# This is required for "gautamkrishnar/keepalive-workflow", see "ddev/github-action-add-on-test"
permissions:
contents: write
actions: write

jobs:
tests:
Expand All @@ -29,7 +33,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: ddev/github-action-add-on-test@v1
- uses: ddev/github-action-add-on-test@v2
with:
ddev_version: ${{ matrix.ddev_version }}
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ For more information [check the documentation](https://docs.google.com/document/
## Prerequisites:
* [Install ddev](https://ddev.readthedocs.io/en/latest/users/install/ddev-installation/) if you haven't already.
* Enable ddev on your local Drupal project.
* Ensure you can already run functional JavaScript tests in the ddev environment. This requires a working chromedriver container as part of your ddev installation. You can run any core functional javascript test without having Gander installed to confirm.

For most use cases, this chrome image should work out of the box:
```ddev get ddev/ddev-selenium-standalone-chrome```
* `ddev get ddev/ddev-selenium-standalone-chrome` to enable functional Javascript tests for DDEV. (`ddev/ddev-selenium-standalone-chrome` is a dependency of this add-on.)

## Getting started
Add Gander and run Drupal's performance tests via a git clone of Drupal core (assuming [composer is
Expand All @@ -31,6 +28,6 @@ used](https://www.drupal.org/docs/develop/using-composer/manage-dependencies)):
* `ddev restart`
* `ddev ssh`
* `cd web/`
* To run a single test three times in order to check the Gander installation, ensure you're in the document root first: `for run in 1..3; do ../vendor/bin/phpunit -c core profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryNodePagePerformanceTest.php --filter hot; done;`
* To run all OpenTelemetry tests: `../vendor/bin/phpunit -c core --group OpenTelemetry`
* To run a single test three times in order to check the Gander installation, ensure you're in the document root first: `for run in 1..3; do phpunit -c core profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryNodePagePerformanceTest.php --filter hot; done;`
* To run all OpenTelemetry tests: `phpunit -c core --group OpenTelemetry`
* Check the Grafana dashboard via: _http://\<projectname\>.ddev.site:3000/_
1 change: 0 additions & 1 deletion docker-compose.gander.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#ddev-generated
version: "3"
services:

# And put them in an OTEL collector pipeline...
Expand Down
3 changes: 3 additions & 0 deletions install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

name: ddev-gander

dependencies:
- ddev/ddev-selenium-standalone-chrome

# pre_install_actions - list of actions to run before installing the addon.
# Examples would be removing an extraneous docker volume,
# or doing a sanity check for requirements.
Expand Down
1 change: 1 addition & 0 deletions tests/test.bats
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ setup() {
ddev delete -Oy ${PROJNAME} >/dev/null 2>&1 || true
cd "${TESTDIR}"
ddev config --project-name=${PROJNAME}
ddev get ddev/ddev-selenium-standalone-chrome
ddev start -y >/dev/null
}

Expand Down