From e93ee799f0967f169a2f0c79e30890c13fd93507 Mon Sep 17 00:00:00 2001
From: Alex Stuart <alex.stuart@jisc.ac.uk>
Date: Tue, 4 Oct 2022 15:16:07 +0100
Subject: [PATCH] Add target to select the appropriate signed products during
 parallel running

See ukf/ukf-meta#369 for details
---
 orchestration.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/orchestration.xml b/orchestration.xml
index e76c3db..c9d1cdb 100644
--- a/orchestration.xml
+++ b/orchestration.xml
@@ -79,6 +79,8 @@
 
         * shared.ws.dir              - the full path the to the shared workspace on the orchestration machine
         * node.fqdn                  - the fully-qualified domain name of the remote (signing) node
+        * compare.ws.dir             - workspace where the compare jobs get their input
+        * node.to.publish            - node from which we take signed products to publish
 
         The following properties MUST be provided as arguments when invoking the targets that make use of them:
 
@@ -93,6 +95,7 @@
     <property name="build.dir" value="${shared.ws.dir}/build"/>
     <property name="tooling.dir" value="${shared.ws.dir}/ukf-meta"/>
     <property name="aggregates.dir" value="${shared.ws.dir}/${git.repo.project.products}/aggregates"/>
+    <property name="select.dir" value="${compare.ws.dir}/${node.to.publish}"/>
 
     <!-- remote working directory may not be the same as the orchestrator (they are the same in production) -->
     <property name="remote.ws.dir" value="${shared.ws.dir}"/>
@@ -253,6 +256,21 @@
         </exec>
     </target>
 
+    <!-- Step SELECT copies the signed products to the appropriate directories -->
+    <target name="fs.select.signed.products">
+        <echo>Copying mdqcache to output directory in orchestrator's workspace</echo>
+        <copy todir="${build.dir}" file="${select.dir}/${mdq.cache}"/>
+        <echo>Copying signed aggregates to orchestrator's ukf-products repository</echo>
+        <copy todir="${aggregates.dir}" file="${select.dir}/${md.prod.signed}"/>
+        <copy todir="${aggregates.dir}" file="${select.dir}/${md.test.signed}"/>
+        <copy todir="${aggregates.dir}" file="${select.dir}/${md.export.signed}"/>
+        <copy todir="${aggregates.dir}" file="${select.dir}/${md.export.preview.signed}"/>
+        <copy todir="${aggregates.dir}" file="${select.dir}/${md.back.signed}"/>
+        <copy todir="${aggregates.dir}" file="${select.dir}/${md.wayf.signed}"/>
+        <copy todir="${aggregates.dir}" file="${select.dir}/${md.cdsall.signed}"/>
+        <copy todir="${aggregates.dir}" file="${select.dir}/${md.wugen.signed}"/>
+    </target>
+
     <!-- Step 5 transfer files back to repo uses the original build.xml -->
 
     <!--