Skip to content

Commit 7c1170e

Browse files
committed
mount
1 parent ac16361 commit 7c1170e

1 file changed

Lines changed: 12 additions & 10 deletions

File tree

tests/scripts/ci.py

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def docker(
153153
scripts: List[str],
154154
env: Dict[str, str],
155155
interactive: bool,
156-
additional_flags: Optional[Dict[str, str]] = None,
156+
additional_flags: Optional[List[Dict[str, str]]] = None,
157157
):
158158
"""
159159
Invoke a set of bash scripts through docker/bash.sh
@@ -209,9 +209,10 @@ def docker(
209209
command.append(f"{key}={value}")
210210

211211
if additional_flags is not None:
212-
for key, value in additional_flags.items():
213-
command.append(key)
214-
command.append(value)
212+
for flag in additional_flags:
213+
for key, value in flag.items():
214+
command.append(key)
215+
command.append(value)
215216

216217
SCRIPT_DIR.mkdir(exist_ok=True)
217218

@@ -222,6 +223,7 @@ def docker(
222223
f.write("\n")
223224

224225
command += [image, "bash", str(script_file.relative_to(REPO_ROOT))]
226+
print(cmd)
225227

226228
try:
227229
cmd(command)
@@ -698,15 +700,15 @@ def add_subparser(
698700
name="adreno",
699701
help="Run Adreno build and test(s)",
700702
post_build=["./tests/scripts/task_build_adreno_bins.sh"],
701-
additional_flags={
702-
"--volume": os.environ.get("ADRENO_OPENCL", "/tmp/") + ":/adreno-opencl",
703-
"--volume": os.environ.get("CI_TEST_INVENTORY", "/Inventory") + ":/Inventory",
704-
"--env": "CI_TEST_INVENTORY=/Inventory",
705-
"--net": "host",
706-
},
703+
additional_flags=[
704+
{"--volume": os.environ.get("ADRENO_OPENCL", "/tmp/") + ":/adreno-opencl"},
705+
{"--volume": os.environ.get("CI_TEST_INVENTORY", "/Inventory") + ":/Inventory"},
706+
{"--net": "host"},
707+
],
707708
env={
708709
"ADRENO_OPENCL": "/adreno-opencl",
709710
"ADRENO_TARGET_CLML_VERSION": os.environ.get("ADRENO_TARGET_CLML_VERSION", "3"),
711+
"CI_TEST_INVENTORY": "/Inventory",
710712
},
711713
options={
712714
"adreno": (

0 commit comments

Comments
 (0)