From ffbc360e427ca47444482ca31ec9d8a134770b20 Mon Sep 17 00:00:00 2001
From: Rhys Smith <rhys.smith@jisc.ac.uk>
Date: Thu, 11 Aug 2016 17:18:50 +0100
Subject: [PATCH] Add support for running the verify flow on all branches in
 the entities repository. Closes #11

---
 build.xml | 45 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index c5474bd6..2a3092f0 100644
--- a/build.xml
+++ b/build.xml
@@ -316,18 +316,53 @@
 
     <!--
         Stage 0 of md process: test creation of aggregates, looking for errors.
+        Uses deferred branch.
+        Assumes you've run a git.pull.all first, as this target doesn't do that.
 
         Runs on: aggr
 
         Process:
-            * Git: Make sure all repos up to date
-            * SAML MD: Generate unsigned aggregates
+            * Git: Checkout deferred branch
+            * SAML MD: Run UK Verify flow
     -->
-    <target name="process.create-aggregates.test" depends="
-        git.pull.all,
+    <target name="process.create-aggregates.test.deferredbranch" depends="
         git.data.deferredbranch.checkout,
         samlmd.aggregates.generate.dry-run">
-        <echo>Stage 0 Success: Test aggregates built successfully from deferred branch.</echo>
+        <echo>Test aggregates built successfully from deferred branch.</echo>
+    </target>
+
+    <!--
+        Stage 0 of md process: test creation of aggregates, looking for errors.
+        Uses immediate branch.
+        Assumes you've run a git.pull.all first, as this target doesn't do that.
+
+        Runs on: aggr
+
+        Process:
+        * Git: Checkout immediate branch
+        * SAML MD: Run UK Verify flow
+    -->
+    <target name="process.create-aggregates.test.immediatebranch" depends="
+        git.data.immediatebranch.checkout,
+        samlmd.aggregates.generate.dry-run">
+        <echo>Test aggregates built successfully from immediate branch.</echo>
+    </target>
+
+    <!--
+        Stage 0 of md process: test creation of aggregates, looking for errors.
+        Uses master branch.
+        Assumes you've run a git.pull.all first, as this target doesn't do that.
+
+        Runs on: aggr
+
+        Process:
+        * Git: Checkout master branch
+        * SAML MD: Run UK Verify flow
+    -->
+    <target name="process.create-aggregates.test.masterbranch" depends="
+        git.data.masterbranch.checkout,
+        samlmd.aggregates.generate.dry-run">
+        <echo>Test aggregates built successfully from master branch.</echo>
     </target>
 
     <!--