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

Remove unsupported distros #1387

Merged
merged 2 commits into from
Nov 6, 2024
Merged
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
15 changes: 0 additions & 15 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ jobs:
strategy:
matrix:
include:
- base_image: ubuntu:focal
tag: focal
- base_image: ubuntu:mantic
tag: mantic
- base_image: debian:bullseye
tag: bullseye
- base_image: debian:testing
Expand Down Expand Up @@ -67,17 +63,6 @@ jobs:
strategy:
matrix:
include:
- sytest_image_tag: focal
dockerfile: synapse
tags: "matrixdotorg/sytest-synapse:focal"
build_args: "SYTEST_IMAGE_TAG=focal"
- sytest_image_tag: mantic
dockerfile: synapse
tags: "matrixdotorg/sytest-synapse:mantic-3.12"
build_args: |
SYTEST_IMAGE_TAG=mantic
PYTHON_VERSION=python3.12
SYSTEM_PIP_INSTALL_SUFFIX=--break-system-packages
- sytest_image_tag: bullseye
dockerfile: synapse
tags: "matrixdotorg/sytest-synapse:bullseye"
Expand Down
12 changes: 0 additions & 12 deletions .github/workflows/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,6 @@ jobs:
fail-fast: false
matrix:
include:
- label: Py 3.8, SQLite 3.31.1, Monolith
sytest-tag: focal

- label: Py 3.8, PG 12, Monolith
sytest-tag: focal
postgres: postgres

- label: Py 3.8, PG 12, Workers
sytest-tag: focal
postgres: postgres
workers: workers

- label: Py 3.10, PG 14, Monolith
sytest-tag: bookworm-python3.10
postgres: postgres
Expand Down
14 changes: 7 additions & 7 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ but its dependencies are.
Included currently is:

- `matrixdotorg/sytest` Base container with SyTest dependencies installed
- Tagged by underlying Debian/Ubuntu image: `focal`, `bullseye` or `testing`
- Tagged by underlying Debian/Ubuntu image: `bullseye` or `testing`
- `matrixdotorg/sytest-synapse`: Runs SyTest against Synapse
- Tagged by underlying Debian/Ubunutu image: `focal`, `bullseye` or `testing`
- Tagged by underlying Debian/Ubuntu image: `bullseye` or `testing`

## Target-specific details

Expand All @@ -23,7 +23,7 @@ it is useful to mount a volume there too.
For example:

```
docker run --rm -it -v /path/to/synapse\:/src:ro -v /path/to/where/you/want/logs\:/logs matrixdotorg/sytest-synapse:focal
docker run --rm -it -v /path/to/synapse\:/src:ro -v /path/to/where/you/want/logs\:/logs matrixdotorg/sytest-synapse:bullseye
```

The following environment variables can be set with `-e` to control the test run:
Expand All @@ -43,7 +43,7 @@ An example of running Synapse in worker mode:

```
docker run --rm -it -e POSTGRES=1 -e WORKERS=1 -v /path/to/synapse\:/src:ro \
-v /path/to/where/you/want/logs\:/logs matrixdotorg/sytest-synapse:focal
-v /path/to/where/you/want/logs\:/logs matrixdotorg/sytest-synapse:bullseye
```

### Dendrite
Expand All @@ -68,7 +68,7 @@ for example:
docker run --rm -it \
-e SYTEST_BRANCH="my-sytest-branch"
-v /path/to/synapse\:/src:ro -v /path/to/where/you/want/logs\:/logs
matrixdotorg/sytest-synapse:focal
matrixdotorg/sytest-synapse:bullseye
```

If the branch referred to by `SYTEST_BRANCH` does not exist, `develop` is used
Expand All @@ -80,7 +80,7 @@ the container:

```
docker run --rm -it -v /path/to/synapse\:/src:ro -v /path/to/where/you/want/logs\:/logs \
-v /path/to/code/sytest\:/sytest:ro matrixdotorg/sytest-synapse:focal
-v /path/to/code/sytest\:/sytest:ro matrixdotorg/sytest-synapse:bullseye
```

## Running a single test file, and other sytest commandline options
Expand All @@ -89,7 +89,7 @@ You can pass arguments to sytest by adding them at the end of the
docker command. For example:

```
docker run --rm -it ... matrixdotorg/sytest-synapse:focal tests/20profile-events.pl
docker run --rm -it ... matrixdotorg/sytest-synapse:bullseye tests/20profile-events.pl
```

## Building the containers
Expand Down
Loading