From eac31e01bde327b1d3ff89f6a7cf7480e5d0c96d Mon Sep 17 00:00:00 2001
From: Bilal Shaikh <bilalshaikh42@gmail.com>
Date: Fri, 14 May 2021 18:36:22 -0400
Subject: [PATCH] fix: order of operations for creating results

---
 .../src/app/services/sbatch/sbatch.service.ts            | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/biosimulations/apps/dispatch-service/src/app/services/sbatch/sbatch.service.ts b/biosimulations/apps/dispatch-service/src/app/services/sbatch/sbatch.service.ts
index aaa18db042..4ac5fbd512 100644
--- a/biosimulations/apps/dispatch-service/src/app/services/sbatch/sbatch.service.ts
+++ b/biosimulations/apps/dispatch-service/src/app/services/sbatch/sbatch.service.ts
@@ -64,13 +64,12 @@ echo -e '${cyan}=============Downloading Combine Archive=============${nc}'
 ( ulimit -f 1048576; srun wget  --progress=bar:force ${apiDomain}run/${simId}/download -O '${omexName}')
 echo -e '${cyan}=============Running docker image for simulator=============${nc}'
 srun  singularity run -B ${tempSimDir}:/root ${simulator} -i '/root/${omexName}' -o '/root'
+echo -e '${cyan}=============Uploading results to data-service=============${nc}
+srun hsload -v reports.h5 '/results/${simId}'
 echo -e '${cyan}=============Creating output archive=============${nc}'
 srun zip ${simId}.zip reports.h5 log.yml plots.zip job.output
-echo -e '${cyan}=============Uploading outputs to storage=============${nc}'
-export PYTHONWARNINGS="ignore"; srun aws --no-verify-ssl --endpoint-url  ${endpoint} s3 sync --exclude "*.sbatch" --exclude "*.omex" . s3://${bucket}/simulations/${simId}
-echo -e '${cyan}=============Uploading results to data-service=============${nc}'
-srun hsload -v reports.h5 '/results/${simId}'
-echo -e '${cyan}=============Run Complete. Thank you for using BioSimulations!=============${nc}'
+echo -e '${cyan}=============Run Complete. Thank you for using BioSimulations!=============${nc}
+export PYTHONWARNINGS = "ignore"; srun aws --no-verify-ssl--endpoint - url  ${endpoint} s3  --acl public-read sync--exclude "*.sbatch" --exclude "*.omex".s3://${bucket}/simulations/${simId}'
 `;
 
     return template;