diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 719f22b4e1..513eb3bde9 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -2,10 +2,11 @@ env:
CODECOV_TOKEN: "2dd7eb9b-0eda-45fe-a47c-9b5ac040045f"
steps:
+
- command:
- "python -m pip install tox"
- - "tox -e pep8"
- label: "\U0001F9F9 PEP-8"
+ - "tox -e check_codestyle"
+ label: "\U0001F9F9 Check Style"
plugins:
- docker#v3.0.1:
image: "python:3.6"
@@ -46,15 +47,16 @@ steps:
- wait
+
- command:
- "python -m pip install tox"
- - "tox -e py27,codecov"
- label: ":python: 2.7 / SQLite"
+ - "tox -e py35-old,codecov"
+ label: ":python: 3.5 / SQLite / Old Deps"
env:
TRIAL_FLAGS: "-j 2"
plugins:
- docker#v3.0.1:
- image: "python:2.7"
+ image: "python:3.5"
propagate-environment: true
retry:
automatic:
@@ -114,33 +116,16 @@ steps:
- exit_status: 2
limit: 2
- - command:
- - "python -m pip install tox"
- - "tox -e py27-old,codecov"
- label: ":python: 2.7 / SQLite / Old Deps"
- env:
- TRIAL_FLAGS: "-j 2"
- plugins:
- - docker#v3.0.1:
- image: "python:2.7"
- propagate-environment: true
- retry:
- automatic:
- - exit_status: -1
- limit: 2
- - exit_status: 2
- limit: 2
-
- - label: ":python: 2.7 / :postgres: 9.4"
+ - label: ":python: 3.5 / :postgres: 9.5"
env:
TRIAL_FLAGS: "-j 4"
command:
- - "bash -c 'python -m pip install tox && python -m tox -e py27-postgres,codecov'"
+ - "bash -c 'python -m pip install tox && python -m tox -e py35-postgres,codecov'"
plugins:
- docker-compose#v2.1.0:
run: testenv
config:
- - .buildkite/docker-compose.py27.pg94.yaml
+ - .buildkite/docker-compose.py35.pg95.yaml
retry:
automatic:
- exit_status: -1
@@ -148,16 +133,16 @@ steps:
- exit_status: 2
limit: 2
- - label: ":python: 2.7 / :postgres: 9.5"
+ - label: ":python: 3.7 / :postgres: 9.5"
env:
TRIAL_FLAGS: "-j 4"
command:
- - "bash -c 'python -m pip install tox && python -m tox -e py27-postgres,codecov'"
+ - "bash -c 'python -m pip install tox && python -m tox -e py37-postgres,codecov'"
plugins:
- docker-compose#v2.1.0:
run: testenv
config:
- - .buildkite/docker-compose.py27.pg95.yaml
+ - .buildkite/docker-compose.py37.pg95.yaml
retry:
automatic:
- exit_status: -1
@@ -165,16 +150,16 @@ steps:
- exit_status: 2
limit: 2
- - label: ":python: 3.5 / :postgres: 9.4"
+ - label: ":python: 3.7 / :postgres: 11"
env:
TRIAL_FLAGS: "-j 4"
command:
- - "bash -c 'python -m pip install tox && python -m tox -e py35-postgres,codecov'"
+ - "bash -c 'python -m pip install tox && python -m tox -e py37-postgres,codecov'"
plugins:
- docker-compose#v2.1.0:
run: testenv
config:
- - .buildkite/docker-compose.py35.pg94.yaml
+ - .buildkite/docker-compose.py37.pg11.yaml
retry:
automatic:
- exit_status: -1
@@ -182,16 +167,17 @@ steps:
- exit_status: 2
limit: 2
- - label: ":python: 3.5 / :postgres: 9.5"
- env:
- TRIAL_FLAGS: "-j 4"
+
+ - label: "SyTest - :python: 3.5 / SQLite / Monolith"
+ agents:
+ queue: "medium"
command:
- - "bash -c 'python -m pip install tox && python -m tox -e py35-postgres,codecov'"
+ - "bash .buildkite/merge_base_branch.sh"
+ - "bash .buildkite/synapse_sytest.sh"
plugins:
- - docker-compose#v2.1.0:
- run: testenv
- config:
- - .buildkite/docker-compose.py35.pg95.yaml
+ - docker#v3.0.1:
+ image: "matrixdotorg/sytest-synapse:py35"
+ propagate-environment: true
retry:
automatic:
- exit_status: -1
@@ -199,16 +185,18 @@ steps:
- exit_status: 2
limit: 2
- - label: ":python: 3.7 / :postgres: 9.5"
+ - label: "SyTest - :python: 3.5 / :postgres: 9.6 / Monolith"
+ agents:
+ queue: "medium"
env:
- TRIAL_FLAGS: "-j 4"
+ POSTGRES: "1"
command:
- - "bash -c 'python -m pip install tox && python -m tox -e py37-postgres,codecov'"
+ - "bash .buildkite/merge_base_branch.sh"
+ - "bash .buildkite/synapse_sytest.sh"
plugins:
- - docker-compose#v2.1.0:
- run: testenv
- config:
- - .buildkite/docker-compose.py37.pg95.yaml
+ - docker#v3.0.1:
+ image: "matrixdotorg/sytest-synapse:py35"
+ propagate-environment: true
retry:
automatic:
- exit_status: -1
@@ -216,16 +204,20 @@ steps:
- exit_status: 2
limit: 2
- - label: ":python: 3.7 / :postgres: 11"
+ - label: "SyTest - :python: 3.5 / :postgres: 9.6 / Workers"
+ agents:
+ queue: "medium"
env:
- TRIAL_FLAGS: "-j 4"
+ POSTGRES: "1"
+ WORKERS: "1"
command:
- - "bash -c 'python -m pip install tox && python -m tox -e py37-postgres,codecov'"
+ - "bash .buildkite/merge_base_branch.sh"
+ - "bash .buildkite/synapse_sytest.sh"
plugins:
- - docker-compose#v2.1.0:
- run: testenv
- config:
- - .buildkite/docker-compose.py37.pg11.yaml
+ - docker#v3.0.1:
+ image: "matrixdotorg/sytest-synapse:py35"
+ propagate-environment: true
+ soft_fail: true
retry:
automatic:
- exit_status: -1
|
