From 66273e14ec0ef6640d63a636100032d70fa16b4d Mon Sep 17 00:00:00 2001
From: Rhys Smith <rhys.smith@jisc.ac.uk>
Date: Fri, 24 May 2019 16:08:36 +0100
Subject: [PATCH] Remove slacktee configuration; update build config to
 reference new location

---
 build.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 0920d302..f43dcb8c 100644
--- a/build.xml
+++ b/build.xml
@@ -146,6 +146,7 @@
     <property name="git.repo.project.data" value="ukf-data"/>
     <property name="git.repo.project.products" value="ukf-products"/>
     <property name="git.repo.project.tooling" value="ukf-meta"/>
+    <property name="git.repo.project.tooling.config" value="ukf-meta-config"/>
 
     <!--
         Build access URLs for each repository.
@@ -153,6 +154,7 @@
     <property name="git.repo.data.url" value="${git.repo.user}@${git.repo.host}:${git.repo.group}/${git.repo.project.data}"/>
     <property name="git.repo.products.url" value="${git.repo.user}@${git.repo.host}:${git.repo.group}/${git.repo.project.products}"/>
     <property name="git.repo.tooling.url" value="${git.repo.user}@${git.repo.host}:${git.repo.group}/${git.repo.project.tooling}"/>
+    <property name="git.repo.tooling.config.url" value="${git.repo.user}@${git.repo.host}:${git.repo.group}/${git.repo.project.tooling.config}"/>
 
     <!--
         *********************************************
@@ -272,6 +274,12 @@
     <property name="tools.slacktee" value="${tools.dir}/slacktee"/>
     <property name="tools.xmlsectool" value="${tools.dir}/xmlsectool-2.0.0"/>
 
+    <!--
+        Location of configuration for externally supplied tool bundles.
+    -->
+    <property name="tools.config.dir" value="${shared.ws.dir}/${git.repo.project.tooling.config}/tools"/>
+    <property name="tools.slacktee.config" value="${tools.config.dir}/slacktee"/>
+
     <!--
         Full path to a commonly used temporary file.
     -->
@@ -1158,7 +1166,7 @@
             <arg value="${utilities.dir}/stats-generate.sh"/>
             <arg value="day"/>
         </exec>
-        <SLACK.send conf="${tools.slacktee}/conf/repo-jenkins.conf" colour="good" channel="ukf-stats"
+        <SLACK.send conf="${tools.slacktee.config}/repo-jenkins.conf" colour="good" channel="ukf-stats"
             message="${stats.daily.output}"/>
     </target>
 
@@ -1640,7 +1648,7 @@
                     <arg value="${git.repo.project.data}"/>
                     <arg value="${git.repo.project.products}"/>
                 </exec>
-                <SLACK.send conf="${tools.slacktee}/conf/aggr-ant.conf" colour="good" channel="ukf-events-publish"
+                <SLACK.send conf="${tools.slacktee.config}/aggr-ant.conf" colour="good" channel="ukf-events-publish"
                     message="${diff.between.publications}"/>
             </then>
         </if>