diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 3712f92ad9..a99d068e96 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -296,11 +296,8 @@ steps:
# This is configured by setting `MULTI_POSTGRES=1` in the environment.
#
# We mostly care about testing each topology.
- # To vary the Python and Postgres versions, we use Docker images which are based
- # on an assortment of Linux distributions.
- # - "bionic" (Ubuntu 18.04) has Python 3.6 and Postgres 10
- # - "buster" (Debian 10) has Python 3.7 and Postgres 11
- # - "testing" (Debian 11) (currently) has Python 3.9 and Postgres 13
+ # For DINSIC specifically, we currently test across one Linux distribution,
+ # Debian buster (10), which has Python 3.7 and Postgres 11
#
# TODO: this leaves us without sytests for Postgres 9.6. How much do we care
# about that?
@@ -318,57 +315,7 @@ steps:
#
################################################################################
- - label: "SyTest Monolith :sqlite::ubuntu: 18.04"
- agents:
- queue: "medium"
- command:
- - "bash .buildkite/merge_base_branch.sh"
- - "bash /bootstrap.sh synapse"
- plugins:
- - docker#v3.7.0:
- image: "matrixdotorg/sytest-synapse:bionic"
- 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.3.0:
- upload: [ "logs/**/*.log", "logs/**/*.log.*", "logs/results.tap" ]
- - matrix-org/annotate:
- path: "logs/annotate.md"
- style: "error"
- retry: *retry_setup
-
- - label: "SyTest Monolith :postgres::ubuntu: 18.04"
- agents:
- queue: "medium"
- env:
- POSTGRES: "1"
- command:
- - "bash .buildkite/merge_base_branch.sh"
- - "bash /bootstrap.sh synapse"
- plugins:
- - docker#v3.7.0:
- image: "matrixdotorg/sytest-synapse:bionic"
- 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.3.0:
- upload: [ "logs/**/*.log", "logs/**/*.log.*", "logs/results.tap" ]
- - matrix-org/annotate:
- path: "logs/annotate.md"
- style: "error"
- retry: *retry_setup
-
- - label: "SyTest Monolith :postgres::debian: testing"
+ - label: "SyTest Monolith :postgres::debian: 10"
agents:
queue: "medium"
env:
@@ -378,37 +325,7 @@ steps:
- "bash /bootstrap.sh synapse"
plugins:
- docker#v3.7.0:
- image: "matrixdotorg/sytest-synapse:testing"
- 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.3.0:
- upload: [ "logs/**/*.log", "logs/**/*.log.*", "logs/results.tap" ]
- - matrix-org/annotate:
- path: "logs/annotate.md"
- style: "error"
- retry: *retry_setup
-
- - label: "SyTest Workers :postgres::ubuntu: 18.04"
- agents:
- queue: "xlarge"
- env:
- MULTI_POSTGRES: "1" # Test with split out databases
- POSTGRES: "1"
- WORKERS: "1"
- BLACKLIST: "synapse-blacklist-with-workers"
- command:
- - "bash .buildkite/merge_base_branch.sh"
- - "bash -c 'cat /src/sytest-blacklist /src/.buildkite/worker-blacklist > /src/synapse-blacklist-with-workers'"
- - "bash /bootstrap.sh synapse"
- plugins:
- - docker#v3.7.0:
- image: "matrixdotorg/sytest-synapse:bionic"
+ image: "matrixdotorg/sytest-synapse:dinsic"
propagate-environment: true
always-pull: true
workdir: "/src"
@@ -438,7 +355,7 @@ steps:
- "bash /bootstrap.sh synapse"
plugins:
- docker#v3.7.0:
- image: "matrixdotorg/sytest-synapse:buster"
+ image: "matrixdotorg/sytest-synapse:dinsic"
propagate-environment: true
always-pull: true
workdir: "/src"
@@ -469,7 +386,7 @@ steps:
- "bash /bootstrap.sh synapse"
plugins:
- docker#v3.7.0:
- image: "matrixdotorg/sytest-synapse:buster"
+ image: "matrixdotorg/sytest-synapse:dinsic"
propagate-environment: true
always-pull: true
workdir: "/src"
|
