Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use Slurm as the default job backend + deprecate support for GC3Pie as job backend #4659

Merged
merged 5 commits into from
Oct 2, 2024
Merged

use Slurm as the default job backend + deprecate support for GC3Pie as job backend #4659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e40aba3
[refactor:job_backend] Use Slurm as the default job back-end
gkaf89 Sep 25, 2024
098fb37
Fix typos and punctuation
gkaf89 Sep 27, 2024
e6391c3
[test:job_backend] Prevent deprecation warning from causing test fail…
gkaf89 Sep 27, 2024
f52adc6
fix marking GC3Pie job backend as deprecated: version indicates when …
boegel Oct 2, 2024
0b5d69b
allow triggering deprecated behaviour for entire test_build_easyconfi…
boegel Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion easybuild/tools/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
DEFAULT_ENV_FOR_SHEBANG = '/usr/bin/env'
DEFAULT_ENVVAR_USERS_MODULES = 'HOME'
DEFAULT_INDEX_MAX_AGE = 7 * 24 * 60 * 60 # 1 week (in seconds)
DEFAULT_JOB_BACKEND = 'GC3Pie'
DEFAULT_JOB_BACKEND = 'Slurm'
DEFAULT_JOB_EB_CMD = 'eb'
DEFAULT_LOGFILE_FORMAT = ("easybuild", "easybuild-%(name)s-%(version)s-%(date)s.%(time)s.log")
DEFAULT_MAX_FAIL_RATIO_PERMS = 0.5
Expand Down
4 changes: 4 additions & 0 deletions easybuild/tools/job/gc3pie.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ def __init__(self, *args, **kwargs):
def _check_version(self):
"""Check whether GC3Pie version complies with required version."""

deprecation_msg = "The GC3Pie job backend is no longer maintained and will be removed"
deprecation_msg += ", please use a different job backend"
_log.deprecated(deprecation_msg, '6.0')

try:
from pkg_resources import get_distribution, DistributionNotFound
pkg = get_distribution('gc3pie')
Expand Down
9 changes: 7 additions & 2 deletions test/framework/parallelbuild.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,8 @@ def test_build_easyconfigs_in_parallel_gc3pie(self):
print("GC3Pie not available, skipping test")
return

self.allow_deprecated_behaviour()

# put GC3Pie config in place to use local host and fork/exec
resourcedir = os.path.join(self.test_prefix, 'gc3pie')
gc3pie_cfgfile = os.path.join(self.test_prefix, 'gc3pie_local.ini')
Expand Down Expand Up @@ -262,7 +264,9 @@ def test_build_easyconfigs_in_parallel_gc3pie(self):
topdir = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
test_easyblocks_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'sandbox')
cmd = "PYTHONPATH=%s:%s:$PYTHONPATH eb %%(spec)s -df" % (topdir, test_easyblocks_path)
build_easyconfigs_in_parallel(cmd, ordered_ecs, prepare_first=False)

with self.mocked_stdout_stderr():
build_easyconfigs_in_parallel(cmd, ordered_ecs, prepare_first=False)

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

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

def test_submit_jobs(self):
"""Test submit_jobs"""
Expand Down
Loading