summary refs log tree commit diff
path: root/.buildkite/pipeline.yml
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-10-08 16:35:08 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-10-08 16:35:08 +0100
commit9ec8072a87b54f6e45d5db42c6ea96dbfff7f306 (patch)
tree63364580fb1d70ccccc1f3f06419a33aa8cdbc7f /.buildkite/pipeline.yml
parentpeek (diff)
downloadsynapse-9ec8072a87b54f6e45d5db42c6ea96dbfff7f306.tar.xz
Temporarily move the sytest job before the wait
Diffstat (limited to '.buildkite/pipeline.yml')
-rw-r--r--.buildkite/pipeline.yml53
1 files changed, 27 insertions, 26 deletions
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 2df0a07b39..d3e8a90297 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -44,6 +44,33 @@ 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"
+      - "ls"
+      - "bash /synapse_sytest.sh"
+    plugins:
+      - docker#v3.0.1:
+          image: "matrixdotorg/sytest-synapse:dinsic"
+          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:
@@ -232,29 +259,3 @@ 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"
-      - "ls"
-      - "bash /synapse_sytest.sh"
-    plugins:
-      - docker#v3.0.1:
-          image: "matrixdotorg/sytest-synapse:dinsic"
-          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"
\ No newline at end of file