diff --git a/test/regression/default_conf/platforms.conf b/test/regression/default_conf/platforms.conf index ae146bd42ec8e83e51bf9382627c67b73be25ff2..4917d3b1098ce83106c14d1569f2c848382d86a5 100644 --- a/test/regression/default_conf/platforms.conf +++ b/test/regression/default_conf/platforms.conf @@ -23,21 +23,33 @@ PROCESSORS_PER_NODE = 24 [moore] TYPE = slurm -HOST = moore +HOST = bsceslogin01 PROJECT = Earth -USER = jlope2 +USER = lbatista SCRATCH_DIR = /esnas/scratch TEST_SUITE = False QUEUE = serial [marenostrum3] +TYPE = lsf +VERSION = mn +HOST = mn3 +PROJECT = bsc32 +QUEUE = debug +ADD_PROJECT_TO_HOST = false +USER = bsc32047 +SCRATCH_DIR = /gpfs/scratch +TEST_SUITE = True +PROCESSORS_PER_NODE = 48 + +[marenostrum4] TYPE = slurm VERSION = mn -HOST = mn-bsc32 +HOST = mn4 PROJECT = bsc32 QUEUE = debug ADD_PROJECT_TO_HOST = false -USER = bsc32704 +USER = bsc32047 SCRATCH_DIR = /gpfs/scratch TEST_SUITE = True PROCESSORS_PER_NODE = 48 diff --git a/test/regression/test_moore_with_paramiko/conf/jobs.conf b/test/regression/test_moore_with_paramiko/conf/jobs.conf index e66d93ec6e4c944b74f5229c6af48c8666e594f0..5c4345ef553c7aed1a70bc2a3ea7f4e96c28eebc 100644 --- a/test/regression/test_moore_with_paramiko/conf/jobs.conf +++ b/test/regression/test_moore_with_paramiko/conf/jobs.conf @@ -15,5 +15,5 @@ DEPENDENCIES = REMOTE_SETUP-1 FILE = TEST_NOLEAP.sh RUNNING = chunk WALLCLOCK = 00:10 -PROCESSORS = 24 +PROCESSORS = 2 DEPENDENCIES = REMOTE_PARALLEL_SETUP-1 \ No newline at end of file diff --git a/test/regression/test_moore_with_saga/conf/jobs.conf b/test/regression/test_moore_with_saga/conf/jobs.conf index e66d93ec6e4c944b74f5229c6af48c8666e594f0..5c4345ef553c7aed1a70bc2a3ea7f4e96c28eebc 100644 --- a/test/regression/test_moore_with_saga/conf/jobs.conf +++ b/test/regression/test_moore_with_saga/conf/jobs.conf @@ -15,5 +15,5 @@ DEPENDENCIES = REMOTE_SETUP-1 FILE = TEST_NOLEAP.sh RUNNING = chunk WALLCLOCK = 00:10 -PROCESSORS = 24 +PROCESSORS = 2 DEPENDENCIES = REMOTE_PARALLEL_SETUP-1 \ No newline at end of file diff --git a/test/regression/tests.conf b/test/regression/tests.conf index abc69541bc11a3a6743d29bdfb85e390d4b953da..be4c44a25f95f2b961a500d3a45912f56a460a43 100644 --- a/test/regression/tests.conf +++ b/test/regression/tests.conf @@ -69,44 +69,44 @@ SRC_PATH = test_large_experiment_on_moore_with_saga [test_large_experiment_on_moore_with_paramiko] HPCARCH = moore DESCRIPTION = "Large experiment with 15 members and 5 chunks on moore with paramiko" -SRC_PATH = test_large_experiment_on_moore_with_saga +SRC_PATH = test_large_experiment_on_moore_with_paramiko #Tests on SEDEMA ################# -[test_sedema_with_paramiko] -HPCARCH = SEDEMA -DESCRIPTION = "Simple experiment on SEDEMA with paramiko" -SRC_PATH = test_sedema_with_paramiko +#[test_sedema_with_paramiko] +#HPCARCH = SEDEMA +#DESCRIPTION = "Simple experiment on SEDEMA with paramiko" +#SRC_PATH = test_sedema_with_paramiko -[test_sedema_with_saga] -HPCARCH = SEDEMA -DESCRIPTION = "Simple experiment on SEDEMA with saga" -SRC_PATH = test_sedema_with_saga +#[test_sedema_with_saga] +#HPCARCH = SEDEMA +#DESCRIPTION = "Simple experiment on SEDEMA with saga" +#SRC_PATH = test_sedema_with_saga -[test_sedema_with_paramiko_python] -HPCARCH = SEDEMA -DESCRIPTION = "Simple experiment on SEDEMA with paramiko and python" -SRC_PATH = test_sedema_with_paramiko_python +#[test_sedema_with_paramiko_python] +#HPCARCH = SEDEMA +#DESCRIPTION = "Simple experiment on SEDEMA with paramiko and python" +#SRC_PATH = test_sedema_with_paramiko_python -[test_sedema_with_saga_python] -HPCARCH = SEDEMA -DESCRIPTION = "Simple experiment on SEDEMA with saga and python" -SRC_PATH = test_sedema_with_saga_python +#[test_sedema_with_saga_python] +#HPCARCH = SEDEMA +#DESCRIPTION = "Simple experiment on SEDEMA with saga and python" +#SRC_PATH = test_sedema_with_saga_python #Tests on mistral ################## -[test_mistral_with_paramiko] -HPCARCH = mistral -DESCRIPTION = "Simple experiment on mistral with paramiko" -SRC_PATH = test_mistral_with_paramiko +#[test_mistral_with_paramiko] +#HPCARCH = mistral +#DESCRIPTION = "Simple experiment on mistral with paramiko" +#SRC_PATH = test_mistral_with_paramiko -[test_mistral_with_saga] -HPCARCH = mistral -DESCRIPTION = "Simple experiment on mistral with saga" -SRC_PATH = test_mistral_with_saga \ No newline at end of file +#[test_mistral_with_saga] +#HPCARCH = mistral +#DESCRIPTION = "Simple experiment on mistral with saga" +#SRC_PATH = test_mistral_with_saga \ No newline at end of file diff --git a/test/regression/tests_runner.py b/test/regression/tests_runner.py index acdc3c0abde3584ecae698028036b9efbf8c08a6..ffd490888b835aaff9937b87eb3677ed6f581410 100644 --- a/test/regression/tests_runner.py +++ b/test/regression/tests_runner.py @@ -108,7 +108,7 @@ def run(current_experiment_id, only_list=None, exclude_list=None, max_threads=5) current_experiment_id = next_experiment_id(current_experiment_id) # Avoiding synchronization problems - sleep(3) + sleep(10) # Loop to wait the end of all the running tests for test_thread in test_threads: