fix extra container intilization (#2887)

* fix extra container intilization

* fix extra url download

* fix extra dir parameter to the agent

* rename extra to extra_dir
This commit is contained in:
Cheick Keita
2023-02-27 13:57:32 -08:00
committed by GitHub
parent a7eab4d973
commit 3d299ce51e
5 changed files with 33 additions and 7 deletions

View File

@ -74,7 +74,6 @@ class Libfuzzer(Command):
analyzer_options: Optional[List[str]] = None,
analyzer_env: Optional[Dict[str, str]] = None,
tools: Optional[Container] = None,
extra_container: Optional[Container] = None,
) -> None:
target_options = target_options or []
@ -88,6 +87,11 @@ class Libfuzzer(Command):
),
]
if ContainerType.extra in containers:
regression_containers.append(
(ContainerType.extra, containers[ContainerType.extra])
)
# We don't really need a separate timeout for crash reporting, and we could just
# use `target_timeout`. But `crash_report_timeout` was introduced first, so we
# can't remove it without a breaking change. Since both timeouts may be present,
@ -129,6 +133,11 @@ class Libfuzzer(Command):
)
)
if ContainerType.extra in containers:
fuzzer_containers.append(
(ContainerType.extra, containers[ContainerType.extra])
)
self.logger.info("creating libfuzzer task")
# disable ensemble sync if only one VM is used
@ -172,6 +181,11 @@ class Libfuzzer(Command):
(ContainerType.readonly_inputs, containers[ContainerType.inputs]),
]
if ContainerType.extra in containers:
coverage_containers.append(
(ContainerType.extra, containers[ContainerType.extra])
)
if ContainerType.readonly_inputs in containers:
coverage_containers.append(
(
@ -232,6 +246,11 @@ class Libfuzzer(Command):
(ContainerType.no_repro, containers[ContainerType.no_repro]),
]
if ContainerType.extra in containers:
report_containers.append(
(ContainerType.extra, containers[ContainerType.extra])
)
self.logger.info("creating libfuzzer_crash_report task")
self.onefuzz.tasks.create(
job.job_id,
@ -270,6 +289,11 @@ class Libfuzzer(Command):
(ContainerType.crashes, containers[ContainerType.crashes]),
]
if ContainerType.extra in containers:
analysis_containers.append(
(ContainerType.extra, containers[ContainerType.extra])
)
self.onefuzz.tasks.create(
job.job_id,
TaskType.generic_analysis,