From 43ebc830cf21f67446ac7c38e6f2fb1203d14c28 Mon Sep 17 00:00:00 2001 From: pneerincx Date: Thu, 21 Nov 2019 17:23:09 +0100 Subject: [PATCH 1/3] Updated expected test results for recent bugfix. --- .../src/main/resources/{templates => workflows}/pbs/footer.ftl | 0 .../src/main/resources/{templates => workflows}/pbs/header.ftl | 0 .../src/main/resources/{templates => workflows}/pbs/submit.ftl | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename molgenis-compute-core/src/main/resources/{templates => workflows}/pbs/footer.ftl (100%) rename molgenis-compute-core/src/main/resources/{templates => workflows}/pbs/header.ftl (100%) rename molgenis-compute-core/src/main/resources/{templates => workflows}/pbs/submit.ftl (100%) diff --git a/molgenis-compute-core/src/main/resources/templates/pbs/footer.ftl b/molgenis-compute-core/src/main/resources/workflows/pbs/footer.ftl similarity index 100% rename from molgenis-compute-core/src/main/resources/templates/pbs/footer.ftl rename to molgenis-compute-core/src/main/resources/workflows/pbs/footer.ftl diff --git a/molgenis-compute-core/src/main/resources/templates/pbs/header.ftl b/molgenis-compute-core/src/main/resources/workflows/pbs/header.ftl similarity index 100% rename from molgenis-compute-core/src/main/resources/templates/pbs/header.ftl rename to molgenis-compute-core/src/main/resources/workflows/pbs/header.ftl diff --git a/molgenis-compute-core/src/main/resources/templates/pbs/submit.ftl b/molgenis-compute-core/src/main/resources/workflows/pbs/submit.ftl similarity index 100% rename from molgenis-compute-core/src/main/resources/templates/pbs/submit.ftl rename to molgenis-compute-core/src/main/resources/workflows/pbs/submit.ftl From c901e188655df8014ae1251f7ea0c66a2f24bb2e Mon Sep 17 00:00:00 2001 From: pneerincx Date: Thu, 21 Nov 2019 17:24:35 +0100 Subject: [PATCH 2/3] Updated expected test results for recent bugfix. --- .../src/test/resources/expected/testGenerate5SLURM/submit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/molgenis-compute-core/src/test/resources/expected/testGenerate5SLURM/submit.sh b/molgenis-compute-core/src/test/resources/expected/testGenerate5SLURM/submit.sh index 2791ff4..164675c 100644 --- a/molgenis-compute-core/src/test/resources/expected/testGenerate5SLURM/submit.sh +++ b/molgenis-compute-core/src/test/resources/expected/testGenerate5SLURM/submit.sh @@ -55,7 +55,7 @@ function cancelJobs () { function processJob () { local _jobName="${1}" - local _jobScript="${jobName}.sh" + local _jobScript="${_jobName}.sh" local _submitOptions="${2:-}" # Optional. local _dependencies="${3:-}" # Optional. local _n=1 From 1b9a4693c7af946a39e37261db82ce9118d2ef0b Mon Sep 17 00:00:00 2001 From: pneerincx Date: Thu, 21 Nov 2019 17:44:38 +0100 Subject: [PATCH 3/3] Revert "Updated expected test results for recent bugfix." This reverts commit 43ebc830cf21f67446ac7c38e6f2fb1203d14c28. Revert accidental move of template files for pbs backend. --- .../src/main/resources/{workflows => templates}/pbs/footer.ftl | 0 .../src/main/resources/{workflows => templates}/pbs/header.ftl | 0 .../src/main/resources/{workflows => templates}/pbs/submit.ftl | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename molgenis-compute-core/src/main/resources/{workflows => templates}/pbs/footer.ftl (100%) rename molgenis-compute-core/src/main/resources/{workflows => templates}/pbs/header.ftl (100%) rename molgenis-compute-core/src/main/resources/{workflows => templates}/pbs/submit.ftl (100%) diff --git a/molgenis-compute-core/src/main/resources/workflows/pbs/footer.ftl b/molgenis-compute-core/src/main/resources/templates/pbs/footer.ftl similarity index 100% rename from molgenis-compute-core/src/main/resources/workflows/pbs/footer.ftl rename to molgenis-compute-core/src/main/resources/templates/pbs/footer.ftl diff --git a/molgenis-compute-core/src/main/resources/workflows/pbs/header.ftl b/molgenis-compute-core/src/main/resources/templates/pbs/header.ftl similarity index 100% rename from molgenis-compute-core/src/main/resources/workflows/pbs/header.ftl rename to molgenis-compute-core/src/main/resources/templates/pbs/header.ftl diff --git a/molgenis-compute-core/src/main/resources/workflows/pbs/submit.ftl b/molgenis-compute-core/src/main/resources/templates/pbs/submit.ftl similarity index 100% rename from molgenis-compute-core/src/main/resources/workflows/pbs/submit.ftl rename to molgenis-compute-core/src/main/resources/templates/pbs/submit.ftl