MAJ terminée. Nous sommes passés en version 14.6.2 . Pour consulter les "releases notes" associées c'est ici :

https://about.gitlab.com/releases/2022/01/11/security-release-gitlab-14-6-2-released/
https://about.gitlab.com/releases/2022/01/04/gitlab-14-6-1-released/

Commit 41c8e0b4 authored by MOMMESSIN Clement's avatar MOMMESSIN Clement
Browse files

[tests] Update with newt CLI and no config file, but dynamic tests are still broken

parent a0361f11
......@@ -123,4 +123,4 @@ Testing
To run the test experiments use the setup target::
./setup.py test
./setup.py test --batsim-bin=path/to/batsim/binary --workloads-basedir=path/to/workloads/dir --platforms-basedir=path/to/platforms/dir
......@@ -700,7 +700,7 @@ class Job(object):
class BatsimScheduler(object):
def __init__(self, options):
def __init__(self, options = {}):
self.options = options
FORMAT = '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
......@@ -757,7 +757,7 @@ class BatsimScheduler(object):
def onNoMoreJobsInWorkloads(self):
self.bs.no_more_static_jobs = True
self.logger.info("There is no more static jobs on the workoad")
self.logger.info("There is no more static jobs in the workoad")
def onBeforeEvents(self):
pass
......
......@@ -517,7 +517,7 @@ class Job:
job=self, type="job_starting_postponed_too_few_resources")
return
if not self._scheduler.has_time_sharing:
if not self._scheduler.has_time_sharing_on_compute:
for r in self.allocation.resources:
for a1 in r.allocations:
for a2 in r.allocations:
......
......@@ -89,7 +89,7 @@ class Resource:
def time_sharing(self):
"""Whether this resource can be shared."""
if self._time_sharing is None:
return self._scheduler.has_time_sharing
return self._scheduler.has_time_sharing_on_compute
return self._time_sharing
@property
......
......@@ -306,9 +306,9 @@ class Scheduler(metaclass=ABCMeta):
return self._time
@property
def has_time_sharing(self):
"""Whether or not time sharing is enabled."""
return self._batsim.time_sharing
def has_time_sharing_on_compute(self):
"""Whether or not time sharing on compute machines is enabled."""
return self._batsim.time_sharing_on_compute
@property
def get_find_resource_handlers(self):
......
......@@ -231,8 +231,7 @@ class JobDescription:
self.res,
self.walltime,
self.workload.name+'!'+self.profile.name,
self.subtime,
self.profile.to_dict())
self.subtime)
self._submitted = True
# Keep track of the workload object in the scheduler to relate job
......
......@@ -16,6 +16,7 @@ class ValidatingMachine(BatsimScheduler):
"""
def __init__(self, scheduler):
super().__init__()
self.scheduler = scheduler
def onAfterBatsimInit(self):
......
......@@ -47,7 +47,7 @@ class TestCommand(UserCommand):
description = 'Run tests'
user_options = [
('batsim-bin=', None, 'Path/to/batsim'),
('batsim-bin=', None, 'Path/to/batsim/binary'),
('workloads-basedir=', None, 'Path/to/batsim/workloads'),
('platforms-basedir=', None, 'Path/to/batsim/platforms')
]
......
......@@ -129,7 +129,7 @@ def generate_basic(
"batsim": {
"executable": {
"path": batsim_bin,
"args": batsim_args,
"args": batsim_args.copy(),
},
"platform": os.path.join(platforms_basedir, "simple_coalloc_platform.xml"),
"workload": w,
......@@ -150,19 +150,9 @@ def generate_sched_static(
batsim_args,
options):
schedulers = []
bat_args = batsim_args.copy()
bat_args.append("--forward-profiles-on-submission")
''' Problems in parent_job status
{
"name_expe": "sched_delayProfilesAsTasks",
"name": "schedDelayProfilesAsTasks",
"verbose": False,
"protection": True,
"interpreter": "coverage",
"options": {
},
"dynamic": True
},
'''
schedulers += [
{
"name_expe": "sched_fillerSched",
......@@ -199,25 +189,10 @@ def generate_sched_static(
"batsim": {
"executable": {
"path": batsim_bin,
"args": batsim_args,
"args": bat_args,
},
"platform": os.path.join(platforms_basedir, "simple_coalloc_platform.xml"),
"workload": w,
"config": {
"redis": {
"enabled": False,
"hostname": "127.0.0.1",
"port": 6379,
"prefix": "default"
},
"job_submission": {
"forward_profiles": True,
"from_scheduler": {
"enabled": s["dynamic"],
"acknowledge": True
}
}
},
"energy": False, # Enables energy-aware experiments
"disable-schedule-tracing": True, # remove paje output
"verbosity": "information" # Sets the Batsim verbosity level. Available values
......@@ -235,6 +210,8 @@ def generate_sched_script(
batsim_args,
options):
schedulers = []
bat_args = batsim_args.copy()
bat_args.append("--forward-profiles-on-submission")
schedulers += [
{
......@@ -271,27 +248,12 @@ def generate_sched_script(
"batsim": {
"executable": {
"path": batsim_bin,
"args": batsim_args,
"args": bat_args,
},
"platform": os.path.join(platforms_basedir, "simple_coalloc_platform.xml"),
"workload-script": {
"path": w,
},
"config": {
"redis": {
"enabled": False,
"hostname": "127.0.0.1",
"port": 6379,
"prefix": "default"
},
"job_submission": {
"forward_profiles": True,
"from_scheduler": {
"enabled": False,
"acknowledge": True
}
}
},
"energy": False, # Enables energy-aware experiments
"disable-schedule-tracing": True, # remove paje output
"verbosity": "information" # Sets the Batsim verbosity level. Available values
......@@ -309,6 +271,10 @@ def generate_sched_dynamic(
batsim_args,
options):
schedulers = []
bat_args = batsim_args.copy()
bat_args.append("--forward-profiles-on-submission")
bat_args.append("--enable-dynamic-jobs")
bat_args.append("--acknowledge-dynamic-jobs")
schedulers += [
{
......@@ -332,24 +298,9 @@ def generate_sched_dynamic(
"batsim": {
"executable": {
"path": batsim_bin,
"args": batsim_args,
"args": bat_args,
},
"platform": os.path.join(platforms_basedir, "simple_coalloc_platform.xml"),
"config": {
"redis": {
"enabled": False,
"hostname": "127.0.0.1",
"port": 6379,
"prefix": "default"
},
"job_submission": {
"forward_profiles": True,
"from_scheduler": {
"enabled": True,
"acknowledge": True
}
}
},
"energy": False, # Enables energy-aware experiments
"disable-schedule-tracing": True, # remove paje output
"verbosity": "information" # Sets the Batsim verbosity level. Available values
......
Markdown is supported
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