From 8419b186e969180adfa8a5d8769bd7a2836702f5 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <clokep@users.noreply.github.com>
Date: Fri, 27 Nov 2020 08:34:09 -0500
Subject: [PATCH] Install the proper requirements for pysaml2 in the trial test
 runners. (#110)

This installs xmlsec1 onto the Synapse trial test runners.
---
 .gitignore           |  1 +
 synapse/pipeline.yml | 27 +++++++++++++++++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9f11b75
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.idea/
diff --git a/synapse/pipeline.yml b/synapse/pipeline.yml
index afd722e..324bc70 100644
--- a/synapse/pipeline.yml
+++ b/synapse/pipeline.yml
@@ -1,3 +1,15 @@
+# This is just a dummy entry (the `x-yaml-aliases` key is not an official pipeline key, and will be ignored by BuildKite)
+# that we use only to store YAML anchors (`&xxx`), that we plan to use and reference later in the YAML file (using `*xxx`)
+# without having to copy/paste the same values over and over.
+# Note: keys like `agent`, `env`, … used here are totally arbitrary; the only point is to define various separate `&xxx` anchors there.
+#
+x-yaml-aliases:
+  commands:
+    - &trial_setup |
+      # Install additional packages that are not part of buildpack-deps / python images.
+      apt-get update && apt-get install -y xmlsec1
+      python -m pip install tox
+
 env:
   COVERALLS_REPO_TOKEN: wsJWOby6j0uCYFiCes3r0XauxO27mx8lD
 
@@ -114,7 +126,7 @@ steps:
 
   - label: ":python: 3.5 / SQLite"
     command:
-      - "python -m pip install tox"
+      - *trial_setup
       - "tox -e py35,combine"
     env:
       TRIAL_FLAGS: "-j 2"
@@ -137,7 +149,7 @@ steps:
 
   - label: ":python: 3.6 / SQLite"
     command:
-      - "python -m pip install tox"
+      - *trial_setup
       - "tox -e py36,combine"
     env:
       TRIAL_FLAGS: "-j 2"
@@ -160,7 +172,7 @@ steps:
 
   - label: ":python: 3.7 / SQLite"
     command:
-      - "python -m pip install tox"
+      - *trial_setup
       - "tox -e py37,combine"
     env:
       TRIAL_FLAGS: "-j 2"
@@ -189,7 +201,8 @@ steps:
       PYTHON_VERSION: "3.5"
       POSTGRES_VERSION: "9.5"
     command:
-      - "bash -c 'python -m pip install tox && python -m tox -e py35-postgres,combine'"
+      - *trial_setup
+      - "python -m tox -e py35-postgres,combine"
     plugins:
       - matrix-org/download#v1.1.0:
           urls:
@@ -218,7 +231,8 @@ steps:
       PYTHON_VERSION: "3.7"
       POSTGRES_VERSION: "11"
     command:
-      - "bash -c 'python -m pip install tox && python -m tox -e py37-postgres,combine'"
+      - *trial_setup
+      - "python -m tox -e py37-postgres,combine"
     plugins:
       - matrix-org/download#v1.1.0:
           urls:
@@ -247,7 +261,8 @@ steps:
       PYTHON_VERSION: "3.8"
       POSTGRES_VERSION: "12"
     command:
-      - "bash -c 'python -m pip install tox && python -m tox -e py38-postgres,combine'"
+      - *trial_setup
+      - "python -m tox -e py38-postgres,combine"
     plugins:
       - matrix-org/download#v1.1.0:
           urls: