Skip to content
This repository was archived by the owner on Nov 25, 2022. It is now read-only.

Commit dba16e3

Browse files
authored
Update synapse pipeline, dropping Python 3.5 builds (#140)
1 parent e1ae0fb commit dba16e3

File tree

1 file changed

+26
-38
lines changed

1 file changed

+26
-38
lines changed

synapse/pipeline.yml

Lines changed: 26 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,15 @@ steps:
119119

120120
# -- Special Case: Oldest Python w/ Oldest Deps
121121

122-
- label: ":python: 3.5 (Old Deps)"
122+
- label: ":python: 3.6 (Old Deps)"
123123
command:
124124
- ".buildkite/scripts/test_old_deps.sh"
125125
env:
126126
TRIAL_FLAGS: "-j 2"
127127
plugins:
128128
- docker#v3.7.0:
129-
image: "ubuntu:xenial" # We use xenial to get an old sqlite and python
129+
# We use bionic to get an old python (3.6.5) and sqlite (3.22)
130+
image: "ubuntu:bionic"
130131
workdir: "/src"
131132
mount-buildkite-agent: false
132133
propagate-environment: true
@@ -154,22 +155,6 @@ steps:
154155

155156
# -- All Supported Python Versions (SQLite)
156157

157-
- label: ":python: 3.5"
158-
command:
159-
- *trial_setup
160-
- "tox -e py35,combine"
161-
env:
162-
TRIAL_FLAGS: "-j 2"
163-
plugins:
164-
- docker#v3.7.0:
165-
image: "python:3.5"
166-
workdir: "/src"
167-
mount-buildkite-agent: false
168-
propagate-environment: true
169-
- artifacts#v1.3.0:
170-
upload: [ "_trial_temp/*/*.log" ]
171-
retry: *retry_setup
172-
173158
- label: ":python: 3.6"
174159
command:
175160
- *trial_setup
@@ -236,16 +221,16 @@ steps:
236221

237222
# -- Oldest and Newest Supported Python and Postgres Pairings
238223

239-
- label: ":python: 3.5 :postgres: 9.5"
224+
- label: ":python: 3.6 :postgres: 9.6"
240225
agents:
241226
queue: "medium"
242227
env:
243228
TRIAL_FLAGS: "-j 8"
244-
PYTHON_VERSION: "3.5"
245-
POSTGRES_VERSION: "9.5"
229+
PYTHON_VERSION: "3.6"
230+
POSTGRES_VERSION: "9.6"
246231
command:
247232
- *trial_setup
248-
- "python -m tox -e py35-postgres,combine"
233+
- "python -m tox -e py36-postgres,combine"
249234
plugins:
250235
- matrix-org/download#v1.1.0:
251236
urls:
@@ -322,10 +307,13 @@ steps:
322307
#
323308
# We mostly care about testing each topology.
324309
# To vary the Python and Postgres versions, we use Docker images which are based
325-
# on an assortment of Debian releases.
326-
# - "py35" is Debian 9 Stretch (Python 3.5, Postgres 9.6)
327-
# - "py37" is Debian 10 Buster (Python 3.7, Postgres 11)
328-
# - "py38" is Debian 11 Bullseye (Python 3.9, Postgres 13)
310+
# on an assortment of Linux distributions.
311+
# - "bionic" (Ubuntu 18.04) has Python 3.6 and Postgres 10
312+
# - "buster" (Debian 10) has Python 3.7 and Postgres 11
313+
# - "bullseye" (Debian 11) (currently) has Python 3.9 and Postgres 13
314+
#
315+
# TODO: this leaves us without sytests for Postgres 9.6. How much do we care
316+
# about that?
329317
#
330318
# Our intent is to test:
331319
# - Monolith:
@@ -340,15 +328,15 @@ steps:
340328
#
341329
################################################################################
342330

343-
- label: "SyTest Monolith :sqlite::debian: 9"
331+
- label: "SyTest Monolith :sqlite::ubuntu: 18.04"
344332
agents:
345333
queue: "medium"
346334
command:
347335
- "bash .buildkite/merge_base_branch.sh"
348336
- "bash /bootstrap.sh synapse"
349337
plugins:
350338
- docker#v3.7.0:
351-
image: "matrixdotorg/sytest-synapse:py35"
339+
image: "matrixdotorg/sytest-synapse:bionic"
352340
propagate-environment: true
353341
always-pull: true
354342
workdir: "/src"
@@ -364,7 +352,7 @@ steps:
364352
style: "error"
365353
retry: *retry_setup
366354

367-
- label: "SyTest Monolith :postgres::debian: 9"
355+
- label: "SyTest Monolith :postgres::ubuntu: 18.04"
368356
agents:
369357
queue: "medium"
370358
env:
@@ -374,7 +362,7 @@ steps:
374362
- "bash /bootstrap.sh synapse"
375363
plugins:
376364
- docker#v3.7.0:
377-
image: "matrixdotorg/sytest-synapse:py35"
365+
image: "matrixdotorg/sytest-synapse:bionic"
378366
propagate-environment: true
379367
always-pull: true
380368
workdir: "/src"
@@ -400,7 +388,7 @@ steps:
400388
- "bash /bootstrap.sh synapse"
401389
plugins:
402390
- docker#v3.7.0:
403-
image: "matrixdotorg/sytest-synapse:py38"
391+
image: "matrixdotorg/sytest-synapse:bullseye"
404392
propagate-environment: true
405393
always-pull: true
406394
workdir: "/src"
@@ -416,7 +404,7 @@ steps:
416404
style: "error"
417405
retry: *retry_setup
418406

419-
- label: "SyTest Workers :postgres::debian: 9"
407+
- label: "SyTest Workers :postgres::ubuntu: 18.04"
420408
agents:
421409
queue: "xlarge"
422410
env:
@@ -430,7 +418,7 @@ steps:
430418
- "bash /bootstrap.sh synapse"
431419
plugins:
432420
- docker#v3.7.0:
433-
image: "matrixdotorg/sytest-synapse:py35"
421+
image: "matrixdotorg/sytest-synapse:bionic"
434422
propagate-environment: true
435423
always-pull: true
436424
workdir: "/src"
@@ -460,7 +448,7 @@ steps:
460448
- "bash /bootstrap.sh synapse"
461449
plugins:
462450
- docker#v3.7.0:
463-
image: "matrixdotorg/sytest-synapse:py37"
451+
image: "matrixdotorg/sytest-synapse:buster"
464452
propagate-environment: true
465453
always-pull: true
466454
workdir: "/src"
@@ -491,7 +479,7 @@ steps:
491479
- "bash /bootstrap.sh synapse"
492480
plugins:
493481
- docker#v3.7.0:
494-
image: "matrixdotorg/sytest-synapse:py37"
482+
image: "matrixdotorg/sytest-synapse:buster"
495483
propagate-environment: true
496484
always-pull: true
497485
workdir: "/src"
@@ -515,12 +503,12 @@ steps:
515503
#
516504
################################################################################
517505

518-
- label: "Port DB :python: 3.5 :postgres: 9.5"
506+
- label: "Port DB :python: 3.6 :postgres: 9.6"
519507
agents:
520508
queue: "medium"
521509
env:
522-
PYTHON_VERSION: "3.5"
523-
POSTGRES_VERSION: "9.5"
510+
PYTHON_VERSION: "3.6"
511+
POSTGRES_VERSION: "9.6"
524512
command:
525513
- "bash .buildkite/scripts/test_synapse_port_db.sh"
526514
plugins:

0 commit comments

Comments
 (0)