@@ -14,19 +14,15 @@ process BENCHMARK_REPORT {
1414 path " versions.yml" , emit: versions
1515
1616 script:
17- def aws_cost_param = benchmark_aws_cur_report ? " --profile cost -P aws_cost: \$ TASK_DIR/${ benchmark_aws_cur_report} " : " "
17+ def aws_cost_param = benchmark_aws_cur_report ? " --aws_cost \$ TASK_DIR/${ benchmark_aws_cur_report} " : " "
1818 def benchmark_samplesheet = " benchmark_samplesheet.csv"
19- def failed_tasks = remove_failed_tasks ? " -P remove_failed_tasks:True " : " "
19+ def failed_tasks = remove_failed_tasks ? " -- remove_failed_tasks" : " "
2020
2121 """
2222 # Set up R environment from renv
2323 export R_LIBS_USER=/project/renv/library/linux-ubuntu-noble/R-4.4/x86_64-pc-linux-gnu
2424 TASK_DIR="\$ PWD"
2525
26- # Setup cache directories
27- export QUARTO_CACHE=/tmp/quarto/cache
28- export XDG_CACHE_HOME=/tmp/quarto
29-
3026 # Copy the baseline report project from the container and overlay repo-managed fixes.
3127 cp -R /project report_project
3228 cp -R ${ projectDir} /modules/local/benchmark_report/overrides/. report_project/
@@ -43,12 +39,11 @@ process BENCHMARK_REPORT {
4339 }.join('\n')}
4440
4541 cd report_project
46- quarto render main_benchmark_report.qmd \\
47- -P log_csv:"\$ TASK_DIR/"${ benchmark_samplesheet} \\
42+ Rscript render_benchmark_report.R \\
43+ --log_csv "\$ TASK_DIR/"${ benchmark_samplesheet} \\
44+ --output benchmark_report.html \\
4845 $aws_cost_param \\
49- $failed_tasks \\
50- --output-dir .\\
51- --output benchmark_report.html
46+ $failed_tasks
5247
5348 cp benchmark_report.html "\$ TASK_DIR/"
5449 cd "\$ TASK_DIR/"
0 commit comments