Skip to content

Commit 6ee5725

Browse files
authored
Add sleep and nf-core/demo pipelines for sun-nomadlab (#67)
* add sleep and nf-core/demo pipelines for sun-nomadlab * alter the logging for a hard failure and soft failure [ci skip]
1 parent c46f183 commit 6ee5725

File tree

3 files changed

+22
-10
lines changed

3 files changed

+22
-10
lines changed

plugins/nf-nomad/src/main/nextflow/nomad/executor/NomadTaskHandler.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ class NomadTaskHandler extends TaskHandler implements FusionAwareTask {
200200
exitFile.text as Integer
201201
}
202202
catch (Exception e) {
203-
log.debug "[NOMAD] Cannot read exit status for task: `$task.name` | ${e.message}"
203+
log.warn "[NOMAD] Cannot read exit status for task: `$task.name` | ${e.message}"
204204
return Integer.MAX_VALUE
205205
}
206206
}
@@ -217,7 +217,7 @@ class NomadTaskHandler extends TaskHandler implements FusionAwareTask {
217217
clientName = nomadService.getClientOfJob( jobName )
218218
log.debug "[NOMAD] determineClientNode: jobName:$jobName; clientName:$clientName"
219219
} catch ( Exception e ){
220-
log.warn ("[NOMAD] Unable to get the client name of job $jobName -- see the log file for details", e)
220+
log.debug ("[NOMAD] Unable to get the client name of job $jobName -- awaiting for a client to be assigned.")
221221
}
222222
}
223223

validation/run-all.sh

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,16 @@ BUILD=0
66
SKIPLOCAL=0
77
NFAZURE=0
88
NFSUN=0
9+
NFSLEEP=0
10+
NFDEMO=0
911

1012
[[ "$@" =~ '--build' ]] && BUILD=1
1113
[[ -f $HOME/.nextflow/plugins/nf-nomad-latest/ ]] && BUILD=1
1214
[[ "$@" =~ '--skiplocal' ]] && SKIPLOCAL=1
1315
[[ "$@" =~ '--nfazure' ]] && NFAZURE=1
1416
[[ "$@" =~ '--nfsun' ]] && NFSUN=1
17+
[[ "$@" =~ '--sleep' ]] && NFSLEEP=1
18+
[[ "$@" =~ '--demo' ]] && NFDEMO=1
1519

1620
if [ "$BUILD" == 1 ]; then
1721
pushd ..
@@ -66,15 +70,23 @@ fi
6670
#NOTE2: You need to have 2 secrets stored in your Nextlow: SUN_NOMADLAB_ACCESS_KEY and SUN_NOMADLAB_SECRET_KEY
6771
if [ "$NFSUN" == 1 ]; then
6872

69-
nextflow run -w s3://juicefs/integration-test -c sun-nomadlab/nextflow.config hello
73+
if [ "$NFSLEEP" == 1 ]; then
74+
nextflow run -w s3://fusionfs/integration-test/work -c sun-nomadlab/nextflow.config abhi18av/nf-sleep --timeout 360
7075

71-
nextflow run bactopia/bactopia \
72-
-w s3://juicefs/integration-test -c sun-nomadlab/nextflow.config \
73-
-profile test,docker --outdir s3://juicefs/bactopia/outdir \
74-
--accession SRX4563634 --coverage 100 --genome_size 2800000 \
75-
--datasets_cache s3://juicefs/bactopia/assets
76+
elif [ "$NFDEMO" == 1 ]; then
77+
nextflow run nf-core/demo \
78+
-w s3://fusionfs/integration-test/work -c sun-nomadlab/nextflow.config \
79+
-profile test,docker --outdir s3://fusionfs/integration-test/nf-core-demo/outdir
80+
else
81+
nextflow run -w s3://fusionfs/integration-test/work -c sun-nomadlab/nextflow.config hello
7682

83+
nextflow run bactopia/bactopia \
84+
-w s3://fusionfs/integration-test/work -c sun-nomadlab/nextflow.config \
85+
-profile test,docker --outdir s3://fusionfs/integration-test/bactopia/outdir \
86+
--accession SRX4563634 --coverage 100 --genome_size 2800000 \
87+
--datasets_cache s3://fusionfs/integration-test/bactopia/assets
88+
fi
7789

7890
else
7991
echo "skip nfsun"
80-
fi
92+
fi

validation/sun-nomadlab/nextflow.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ nomad {
3030
}
3131

3232
jobs {
33-
deleteOnCompletion = true
33+
deleteOnCompletion = false
3434
volumes = [
3535
{ type "csi" name "juicefs-volume" }
3636
]

0 commit comments

Comments
 (0)