From 8231769c98427672906373319399cb663148ede0 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Fri, 21 May 2021 16:28:02 +0100
Subject: Switch back to using Sytest dinsic branch

As part of the 1.31.0 mainline merge, we updated the buildkite pipeline to
more closely match mainline. Unfortunately we accidentally also updated the
sytest portion verbatim, which meant we were now running Sytest develop
against dinsic. This inevitably broke as dinsic started to fall behind
mainline again.

This commit returns us back to the dinsic tag of matrixdotorg/sytest-synapse,
as well as removes some Linux distro variations which we aren't using
for dinsic.
---
 .buildkite/pipeline.yml | 88 +++----------------------------------------------
 1 file changed, 4 insertions(+), 84 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 3712f92ad9..e4b6b3c7e9 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -318,57 +318,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 +328,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 +358,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 +389,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"
-- 
cgit 1.5.1


From eedaf793b9c319ea9e9f05e0a16038c33f193a3e Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Fri, 21 May 2021 17:28:19 +0100
Subject: Note the debian version of the sytest image we're using

---
 .buildkite/pipeline.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index e4b6b3c7e9..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?
-- 
cgit 1.5.1