OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: lava: pass CI_NODE_INDEX and CI_NODE_TOTAL to lava jobs

Browse Source 
deqp-runner.sh uses it to determine whether we split job across multiple
devices and if we do what's the node index.

With this change we now can set 'parallel: N' in job description if we want
to split the job.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3163>
This commit is contained in:
Vasily Khoruzhick
2020-01-16 19:37:32 -08:00
committed by Marge Bot
parent 26d93a7495
commit 5e5b5348f6
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci/generate_lava.py
View File

@@ -16,6 +16,8 @@ parser.add_argument("--lava-tags", nargs='?', default="")
parser.add_argument("--env-vars", nargs='?', default="") parser.add_argument("--env-vars", nargs='?', default="")
parser.add_argument("--deqp-version") parser.add_argument("--deqp-version")
parser.add_argument("--arch") parser.add_argument("--arch")
parser.add_argument("--ci-node-index")
parser.add_argument("--ci-node-total")
args = parser.parse_args() args = parser.parse_args()
env = Environment(loader = FileSystemLoader(os.path.dirname(args.template)), trim_blocks=True, lstrip_blocks=True) env = Environment(loader = FileSystemLoader(os.path.dirname(args.template)), trim_blocks=True, lstrip_blocks=True)
@@ -32,6 +34,8 @@ values['tags'] = args.lava_tags
values['env_vars'] = args.env_vars values['env_vars'] = args.env_vars
values['deqp_version'] = args.deqp_version values['deqp_version'] = args.deqp_version
values['arch'] = args.arch values['arch'] = args.arch
values['ci_node_index'] = args.ci_node_index
values['ci_node_total'] = args.ci_node_total
f = open('lava-deqp.yml', "w") f = open('lava-deqp.yml', "w")
f.write(template.render(values)) f.write(template.render(values))

2
.gitlab-ci/lava-deqp.yml.jinja2
View File

@@ -70,6 +70,8 @@ actions:
- export DEQP_SKIPS=deqp-{{ gpu_version }}-skips.txt - export DEQP_SKIPS=deqp-{{ gpu_version }}-skips.txt
- export DEQP_VER={{ deqp_version }} - export DEQP_VER={{ deqp_version }}
- export LIBGL_DRIVERS_PATH=`pwd`/install/lib/dri - export LIBGL_DRIVERS_PATH=`pwd`/install/lib/dri
- export CI_NODE_INDEX={{ ci_node_index }}
- export CI_NODE_TOTAL={{ ci_node_total }}
# Put stuff where the runner script expects it # Put stuff where the runner script expects it
- mkdir artifacts - mkdir artifacts

4
.gitlab-ci/lava-gitlab-ci.yml
View File

@@ -19,7 +19,9 @@
--kernel-image-type "${KERNEL_IMAGE_TYPE}" \ --kernel-image-type "${KERNEL_IMAGE_TYPE}" \
--gpu-version ${GPU_VERSION} \ --gpu-version ${GPU_VERSION} \
--boot-method ${BOOT_METHOD} \ --boot-method ${BOOT_METHOD} \
--lava-tags "${LAVA_TAGS}" --lava-tags "${LAVA_TAGS}" \
--ci-node-index "${CI_NODE_INDEX}" \
--ci-node-total "${CI_NODE_TOTAL}"
- lava_job_id=`lavacli jobs submit lava-deqp.yml` - lava_job_id=`lavacli jobs submit lava-deqp.yml`
- echo $lava_job_id - echo $lava_job_id
- rm -rf artifacts/* - rm -rf artifacts/*