Skip to content
Snippets Groups Projects
Unverified Commit ca051d4a authored by Harmen Stoppels's avatar Harmen Stoppels Committed by GitHub
Browse files

Allow parallel jobs and let slurm schedule them (#1075)

parent 2e90a382
Branches master
No related tags found
No related merge requests found
...@@ -49,6 +49,7 @@ variables: ...@@ -49,6 +49,7 @@ variables:
SLURM_JOB_NUM_NODES: 2 SLURM_JOB_NUM_NODES: 2
SLURM_PARTITION: normal SLURM_PARTITION: normal
SLURM_TIMELIMIT: '15:00' SLURM_TIMELIMIT: '15:00'
SLURM_EXCLUSIVE: '' # make sure resources are not shared
### Release tests ### ### Release tests ###
allocate release: allocate release:
...@@ -65,7 +66,6 @@ single node release: ...@@ -65,7 +66,6 @@ single node release:
image: $CI_REGISTRY_IMAGE/release/deploy:$CI_COMMIT_SHA image: $CI_REGISTRY_IMAGE/release/deploy:$CI_COMMIT_SHA
only: ['master', 'staging', 'trying'] only: ['master', 'staging', 'trying']
stage: test stage: test
resource_group: daint-job
script: script:
- unit - unit
- unit-local - unit-local
...@@ -80,7 +80,6 @@ multi node release: ...@@ -80,7 +80,6 @@ multi node release:
image: $CI_REGISTRY_IMAGE/release/deploy:$CI_COMMIT_SHA image: $CI_REGISTRY_IMAGE/release/deploy:$CI_COMMIT_SHA
only: ['master', 'staging', 'trying'] only: ['master', 'staging', 'trying']
stage: test stage: test
resource_group: daint-job
script: script:
- unit-mpi - unit-mpi
variables: variables:
...@@ -111,7 +110,6 @@ single node codecov: ...@@ -111,7 +110,6 @@ single node codecov:
only: ['master', 'staging', 'trying'] only: ['master', 'staging', 'trying']
image: $CI_REGISTRY_IMAGE/codecov/deploy:$CI_COMMIT_SHA image: $CI_REGISTRY_IMAGE/codecov/deploy:$CI_COMMIT_SHA
stage: test stage: test
resource_group: daint-job
script: script:
- codecov_pre - codecov_pre
- unit - unit
...@@ -131,7 +129,6 @@ multi node codecov: ...@@ -131,7 +129,6 @@ multi node codecov:
only: ['master', 'staging', 'trying'] only: ['master', 'staging', 'trying']
image: $CI_REGISTRY_IMAGE/codecov/deploy:$CI_COMMIT_SHA image: $CI_REGISTRY_IMAGE/codecov/deploy:$CI_COMMIT_SHA
stage: test stage: test
resource_group: daint-job
script: script:
- codecov_pre - codecov_pre
- unit-mpi - unit-mpi
...@@ -154,7 +151,6 @@ upload codecov reports: ...@@ -154,7 +151,6 @@ upload codecov reports:
SLURM_NTASKS: 1 SLURM_NTASKS: 1
ALLOCATION_NAME: arbor-ci-codecov-$CI_PIPELINE_ID ALLOCATION_NAME: arbor-ci-codecov-$CI_PIPELINE_ID
script: upload_codecov script: upload_codecov
resource_group: daint-job
deallocate codecov: deallocate codecov:
only: ['master', 'staging', 'trying'] only: ['master', 'staging', 'trying']
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment