diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh index 99fe25fd27ece628ef342deb99088b4b02538cff..f5f1a646a8ab4dd12fab4686e39e1e726330abac 100755 --- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh +++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh @@ -187,7 +187,7 @@ test -e /usr/lib64/libjemalloc.so.1 && export LD_PRELOAD=/usr/lib64/libjemalloc. eos attr set sys.workflow.closew.default="proto/cta:ctafrontend:10955 <parent/file>" ${CTA_WF_DIR} # Set the worflow rule for creating tape file replicas in the EOS namespace. -eos attr set sys.workflow.archived.default="bash:shell:cta eos file tag <eos::wfe::path> +<eos::wfe::cxattr:CTA_TapeFsId>" ${CTA_WF_DIR} +eos attr set sys.workflow.archived.default="proto/cta:ctafrontend:10955 <parent/file>" ${CTA_WF_DIR} # Set the workflow rule for retrieving file from tape. eos attr set sys.workflow.sync::prepare.default="proto/cta:ctafrontend:10955 <parent/file>" ${CTA_WF_DIR} @@ -198,7 +198,7 @@ eos attr set sys.workflow.sync::prepare.default="proto/cta:ctafrontend:10955 <pa # haved causes the unwanted action of copying the disk file to tape again. # The action of the CTA_retrieve workflow when triggered by the closew event is # to set the CTA_retrieved_timestamp attribute. -eos attr set sys.workflow.closew.CTA_retrieve="bash:shell:cta eos attr set 'CTA_retrieved_timestamp=\"\`date\`\"' <eos::wfe::path>" ${CTA_WF_DIR} +eos attr set sys.workflow.closew.CTA_retrieve="proto/cta:ctafrontend:10955 <parent/file>" ${CTA_WF_DIR} # configure preprod directory separately /opt/run/bin/eos_configure_preprod.sh 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 b2ba056c2320e1dfd7f4412749a1c19813b2a0b7..40f082a0218f2a5f6efc79f83af26c4635fcda3c 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 @@ -15,12 +15,7 @@ eos attr set CTA_StorageClass=ctaStorageClass ${PREPROD_DIR} eos attr set CTA_TapeFsId=65535 ${PREPROD_DIR} eos attr set sys.workflow.closew.default="proto/cta:ctafrontend:10955 <parent/file>" ${PREPROD_DIR} - -#eos attr set sys.workflow.archived.default="bash:shell:cta eos file tag <eos::wfe::path> +<eos::wfe::cxattr:CTA_TapeFsId>" ${PREPROD_DIR} -eos attr set sys.workflow.archived.default="bash:create_tape_drop_disk_replicas:cta <eos::wfe::path> <eos::wfe::cxattr:CTA_TapeFsId>" ${PREPROD_DIR} - +eos attr set sys.workflow.closew.CTA_retrieve="proto/cta:ctafrontend:10955 <parent/file>" ${PREPROD_DIR} +eos attr set sys.workflow.archived.default="proto/cta:ctafrontend:10955 <parent/file>" ${PREPROD_DIR} eos attr set sys.workflow.sync::prepare.default="proto/cta:ctafrontend:10955 <parent/file>" ${PREPROD_DIR} - -eos attr set sys.workflow.closew.CTA_retrieve="bash:shell:cta eos attr set 'CTA_retrieved_timestamp=\"\`date\`\"' <eos::wfe::path>" ${PREPROD_DIR} - eos attr set sys.workflow.sync::delete.default="proto/cta:ctafrontend:10955 <parent/file>" ${PREPROD_DIR}