Skip to content

Commit 18d5c0b

Browse files
authored
Merge pull request #4659 from gkaf89/refactor/default-job-backend
use Slurm as the default job backend + deprecate support for GC3Pie as job backend
2 parents 3f5edf5 + 0b5d69b commit 18d5c0b

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

easybuild/tools/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
DEFAULT_ENV_FOR_SHEBANG = '/usr/bin/env'
9797
DEFAULT_ENVVAR_USERS_MODULES = 'HOME'
9898
DEFAULT_INDEX_MAX_AGE = 7 * 24 * 60 * 60 # 1 week (in seconds)
99-
DEFAULT_JOB_BACKEND = 'GC3Pie'
99+
DEFAULT_JOB_BACKEND = 'Slurm'
100100
DEFAULT_JOB_EB_CMD = 'eb'
101101
DEFAULT_LOGFILE_FORMAT = ("easybuild", "easybuild-%(name)s-%(version)s-%(date)s.%(time)s.log")
102102
DEFAULT_MAX_FAIL_RATIO_PERMS = 0.5

easybuild/tools/job/gc3pie.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@ def __init__(self, *args, **kwargs):
104104
def _check_version(self):
105105
"""Check whether GC3Pie version complies with required version."""
106106

107+
deprecation_msg = "The GC3Pie job backend is no longer maintained and will be removed"
108+
deprecation_msg += ", please use a different job backend"
109+
_log.deprecated(deprecation_msg, '6.0')
110+
107111
try:
108112
from pkg_resources import get_distribution, DistributionNotFound
109113
pkg = get_distribution('gc3pie')

test/framework/parallelbuild.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,8 @@ def test_build_easyconfigs_in_parallel_gc3pie(self):
223223
print("GC3Pie not available, skipping test")
224224
return
225225

226+
self.allow_deprecated_behaviour()
227+
226228
# put GC3Pie config in place to use local host and fork/exec
227229
resourcedir = os.path.join(self.test_prefix, 'gc3pie')
228230
gc3pie_cfgfile = os.path.join(self.test_prefix, 'gc3pie_local.ini')
@@ -262,7 +264,9 @@ def test_build_easyconfigs_in_parallel_gc3pie(self):
262264
topdir = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
263265
test_easyblocks_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'sandbox')
264266
cmd = "PYTHONPATH=%s:%s:$PYTHONPATH eb %%(spec)s -df" % (topdir, test_easyblocks_path)
265-
build_easyconfigs_in_parallel(cmd, ordered_ecs, prepare_first=False)
267+
268+
with self.mocked_stdout_stderr():
269+
build_easyconfigs_in_parallel(cmd, ordered_ecs, prepare_first=False)
266270

267271
toy_modfile = os.path.join(self.test_installpath, 'modules', 'all', 'toy', '0.0')
268272
if get_module_syntax() == 'Lua':
@@ -280,7 +284,8 @@ def test_build_easyconfigs_in_parallel_gc3pie(self):
280284
ecs = resolve_dependencies(process_easyconfig(test_ecfile), self.modtool)
281285

282286
error = "1 jobs failed: toy-1.2.3"
283-
self.assertErrorRegex(EasyBuildError, error, build_easyconfigs_in_parallel, cmd, ecs, prepare_first=False)
287+
with self.mocked_stdout_stderr():
288+
self.assertErrorRegex(EasyBuildError, error, build_easyconfigs_in_parallel, cmd, ecs, prepare_first=False)
284289

285290
def test_submit_jobs(self):
286291
"""Test submit_jobs"""

0 commit comments

Comments
 (0)