From ac0f9b9d48cc523babbee2e0e247ca336e334868 Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Thu, 15 Feb 2018 16:06:55 +0100
Subject: [PATCH] Removed the closew.CTA_retrieve workflow as it no longer
 required

---
 .../ctafrontend/cc7/opt/run/bin/eos_configure_preprod.sh    | 1 -
 continuousintegration/orchestration/create_instance.sh      | 6 +-----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/eos_configure_preprod.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/eos_configure_preprod.sh
index 1c7966ee40..db66af2eab 100755
--- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/eos_configure_preprod.sh
+++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/eos_configure_preprod.sh
@@ -10,7 +10,6 @@ eos attr set CTA_TapeFsId=65535 ${PREPROD_DIR}
 
 eos attr set sys.workflow.sync::openw.default="proto:ctafrontend:10955 ctafrontend" ${PREPROD_DIR}
 eos attr set sys.workflow.closew.default="proto:ctafrontend:10955 ctafrontend" ${PREPROD_DIR}
-eos attr set sys.workflow.closew.CTA_retrieve="proto:ctafrontend:10955 ctafrontend" ${PREPROD_DIR}
 eos attr set sys.workflow.archived.default="proto:ctafrontend:10955 ctafrontend" ${PREPROD_DIR}
 eos attr set sys.workflow.sync::prepare.default="proto:ctafrontend:10955 ctafrontend" ${PREPROD_DIR}
 eos attr set sys.workflow.sync::delete.default="proto:ctafrontend:10955 ctafrontend" ${PREPROD_DIR}
diff --git a/continuousintegration/orchestration/create_instance.sh b/continuousintegration/orchestration/create_instance.sh
index 855eb6ebbb..a2b0fef31e 100755
--- a/continuousintegration/orchestration/create_instance.sh
+++ b/continuousintegration/orchestration/create_instance.sh
@@ -300,10 +300,6 @@ echo OK
 # Set the workflow rules for archiving, creating tape file replicas in the EOS namespace, retrieving
 # files from tape and deleting files.
 #
-# The closew.CTA_retrieve workflow prevents the default workflow from receiving the closew event, as
-# we don't want to trigger the action of copying the retrived disk file to tape again. The
-# closew.CTA_retrieve workflow sets the CTA_retrieved_timestamp attribute.
-#
 # The FQDN can be set as follows:
 # CTA_ENDPOINT=ctafrontend.${instance}.svc.cluster.local:10955
 #
@@ -312,7 +308,7 @@ CTA_ENDPOINT=ctafrontend:10955
 
 echo "Setting workflows in namespace ${instance} pod ctaeos:"
 CTA_WF_DIR=/eos/${EOSINSTANCE}/proc/cta/workflow
-for WORKFLOW in sync::openw.default closew.default archived.default sync::prepare.default closew.CTA_retrieve sync::delete.default
+for WORKFLOW in sync::openw.default closew.default archived.default sync::prepare.default sync::delete.default
 do
   echo "eos attr set sys.workflow.${WORKFLOW}=\"proto:${CTA_ENDPOINT} ctafrontend\" ${CTA_WF_DIR}"
   kubectl --namespace=${instance} exec ctaeos -- bash -c "eos attr set sys.workflow.${WORKFLOW}=\"proto:${CTA_ENDPOINT} ctafrontend\" ${CTA_WF_DIR}"
-- 
GitLab