diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 32fe64092a..1f035a6ab1 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -44,108 +44,6 @@ steps:
- docker#v3.0.1:
image: "python:3.6"
- - label: "SyTest - :python: 2.7 / :postgres: 9.6 / Monolith"
- agents:
- queue: "medium"
- env:
- POSTGRES: "1"
- command:
- - "bash .buildkite/merge_base_branch.sh"
- - "bash /synapse_sytest.sh"
- plugins:
- - docker#v3.0.1:
- image: "matrixdotorg/sytest-synapse:dinsic-test"
- propagate-environment: true
- always-pull: true
- workdir: "/src"
- entrypoint: "/bin/sh"
- init: false
- shell: ["-x", "-c"]
- mount-buildkite-agent: false
- volumes: ["./logs:/logs"]
- - artifacts#v1.2.0:
- upload: [ "logs/**/*.log", "logs/**/*.log.*", "logs/results.tap" ]
- - matrix-org/annotate:
- path: "logs/annotate.md"
- style: "error"
-
- - label: "SyTest - :python: 2.7 / :postgres: 9.6 / Workers"
- agents:
- queue: "xlarge"
- env:
- POSTGRES: "1"
- WORKERS: "1"
- command:
- - "bash .buildkite/merge_base_branch.sh"
- - "bash /synapse_sytest.sh"
- plugins:
- - docker#v3.0.1:
- image: "matrixdotorg/sytest-synapse:dinsic-test"
- propagate-environment: true
- always-pull: true
- workdir: "/src"
- entrypoint: "/bin/sh"
- init: false
- shell: ["-x", "-c"]
- mount-buildkite-agent: false
- volumes: ["./logs:/logs"]
- - artifacts#v1.2.0:
- upload: [ "logs/**/*.log", "logs/**/*.log.*", "logs/results.tap" ]
- - matrix-org/annotate:
- path: "logs/annotate.md"
- style: "error"
-
- - label: "SyTest - :python: 3 / :postgres: 9.6 / Monolith"
- agents:
- queue: "medium"
- env:
- POSTGRES: "1"
- command:
- - "bash .buildkite/merge_base_branch.sh"
- - "bash /synapse_sytest.sh"
- plugins:
- - docker#v3.0.1:
- image: "matrixdotorg/sytest-synapse:dinsic-test-py3"
- propagate-environment: true
- always-pull: true
- workdir: "/src"
- entrypoint: "/bin/sh"
- init: false
- shell: ["-x", "-c"]
- mount-buildkite-agent: false
- volumes: ["./logs:/logs"]
- - artifacts#v1.2.0:
- upload: [ "logs/**/*.log", "logs/**/*.log.*", "logs/results.tap" ]
- - matrix-org/annotate:
- path: "logs/annotate.md"
- style: "error"
-
- - label: "SyTest - :python: 3 / :postgres: 9.6 / Workers"
- agents:
- queue: "xlarge"
- env:
- POSTGRES: "1"
- WORKERS: "1"
- command:
- - "bash .buildkite/merge_base_branch.sh"
- - "bash /synapse_sytest.sh"
- plugins:
- - docker#v3.0.1:
- image: "matrixdotorg/sytest-synapse:dinsic-test-py3"
- propagate-environment: true
- always-pull: true
- workdir: "/src"
- entrypoint: "/bin/sh"
- init: false
- shell: ["-x", "-c"]
- mount-buildkite-agent: false
- volumes: ["./logs:/logs"]
- - artifacts#v1.2.0:
- upload: [ "logs/**/*.log", "logs/**/*.log.*", "logs/results.tap" ]
- - matrix-org/annotate:
- path: "logs/annotate.md"
- style: "error"
-
- wait
- command:
@@ -334,3 +232,106 @@ steps:
limit: 2
- exit_status: 2
limit: 2
+
+ - label: "SyTest - :python: 2.7 / :postgres: 9.6 / Monolith"
+ agents:
+ queue: "medium"
+ env:
+ POSTGRES: "1"
+ command:
+ - "bash .buildkite/merge_base_branch.sh"
+ - "bash /synapse_sytest.sh"
+ plugins:
+ - docker#v3.0.1:
+ image: "matrixdotorg/sytest-synapse:dinsic-test"
+ propagate-environment: true
+ always-pull: true
+ workdir: "/src"
+ entrypoint: "/bin/sh"
+ init: false
+ shell: ["-x", "-c"]
+ mount-buildkite-agent: false
+ volumes: ["./logs:/logs"]
+ - artifacts#v1.2.0:
+ upload: [ "logs/**/*.log", "logs/**/*.log.*", "logs/results.tap" ]
+ - matrix-org/annotate:
+ path: "logs/annotate.md"
+ style: "error"
+
+ - label: "SyTest - :python: 2.7 / :postgres: 9.6 / Workers"
+ agents:
+ queue: "xlarge"
+ env:
+ POSTGRES: "1"
+ WORKERS: "1"
+ command:
+ - "bash .buildkite/merge_base_branch.sh"
+ - "bash /synapse_sytest.sh"
+ plugins:
+ - docker#v3.0.1:
+ image: "matrixdotorg/sytest-synapse:dinsic-test"
+ propagate-environment: true
+ always-pull: true
+ workdir: "/src"
+ entrypoint: "/bin/sh"
+ init: false
+ shell: ["-x", "-c"]
+ mount-buildkite-agent: false
+ volumes: ["./logs:/logs"]
+ - artifacts#v1.2.0:
+ upload: [ "logs/**/*.log", "logs/**/*.log.*", "logs/results.tap" ]
+ - matrix-org/annotate:
+ path: "logs/annotate.md"
+ style: "error"
+
+ - label: "SyTest - :python: 3 / :postgres: 9.6 / Monolith"
+ agents:
+ queue: "medium"
+ env:
+ POSTGRES: "1"
+ command:
+ - "bash .buildkite/merge_base_branch.sh"
+ - "bash /synapse_sytest.sh"
+ plugins:
+ - docker#v3.0.1:
+ image: "matrixdotorg/sytest-synapse:dinsic-py3"
+ propagate-environment: true
+ always-pull: true
+ workdir: "/src"
+ entrypoint: "/bin/sh"
+ init: false
+ shell: ["-x", "-c"]
+ mount-buildkite-agent: false
+ volumes: ["./logs:/logs"]
+ - artifacts#v1.2.0:
+ upload: [ "logs/**/*.log", "logs/**/*.log.*", "logs/results.tap" ]
+ - matrix-org/annotate:
+ path: "logs/annotate.md"
+ style: "error"
+
+ - label: "SyTest - :python: 3 / :postgres: 9.6 / Workers"
+ agents:
+ queue: "xlarge"
+ env:
+ POSTGRES: "1"
+ WORKERS: "1"
+ command:
+ - "bash .buildkite/merge_base_branch.sh"
+ - "bash /synapse_sytest.sh"
+ plugins:
+ - docker#v3.0.1:
+ image: "matrixdotorg/sytest-synapse:dinsic-py3"
+ propagate-environment: true
+ always-pull: true
+ workdir: "/src"
+ entrypoint: "/bin/sh"
+ init: false
+ shell: ["-x", "-c"]
+ mount-buildkite-agent: false
+ volumes: ["./logs:/logs"]
+ - artifacts#v1.2.0:
+ upload: [ "logs/**/*.log", "logs/**/*.log.*", "logs/results.tap" ]
+ - matrix-org/annotate:
+ path: "logs/annotate.md"
+ style: "error"
+
|
