diff options
| author | Vasily Khoruzhick <[email protected]> | 2020-01-16 19:37:32 -0800 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-01-21 09:33:57 +0000 |
| commit | 5e5b5348f605361cbfde3d7eff685e683c18af4a (patch) | |
| tree | b51da73345354a005fa1e1447ade72e3db4c1581 /.gitlab-ci | |
| parent | 26d93a7495511ded7cca3ed46bcdf7e134c0f929 (diff) | |
ci: lava: pass CI_NODE_INDEX and CI_NODE_TOTAL to lava jobs
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 <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3163>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/generate_lava.py | 4 | ||||
| -rw-r--r-- | .gitlab-ci/lava-deqp.yml.jinja2 | 2 | ||||
| -rw-r--r-- | .gitlab-ci/lava-gitlab-ci.yml | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/.gitlab-ci/generate_lava.py b/.gitlab-ci/generate_lava.py index f83f0e8d4d3..f7631e1f30c 100755 --- a/.gitlab-ci/generate_lava.py +++ b/.gitlab-ci/generate_lava.py @@ -16,6 +16,8 @@ parser.add_argument("--lava-tags", nargs='?', default="") parser.add_argument("--env-vars", nargs='?', default="") parser.add_argument("--deqp-version") parser.add_argument("--arch") +parser.add_argument("--ci-node-index") +parser.add_argument("--ci-node-total") args = parser.parse_args() 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['deqp_version'] = args.deqp_version 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.write(template.render(values)) diff --git a/.gitlab-ci/lava-deqp.yml.jinja2 b/.gitlab-ci/lava-deqp.yml.jinja2 index c974a66788d..73101a7aa85 100644 --- a/.gitlab-ci/lava-deqp.yml.jinja2 +++ b/.gitlab-ci/lava-deqp.yml.jinja2 @@ -70,6 +70,8 @@ actions: - export DEQP_SKIPS=deqp-{{ gpu_version }}-skips.txt - export DEQP_VER={{ deqp_version }} - 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 - mkdir artifacts diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index d5bdb922448..0f1886c2a23 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -19,7 +19,9 @@ --kernel-image-type "${KERNEL_IMAGE_TYPE}" \ --gpu-version ${GPU_VERSION} \ --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` - echo $lava_job_id - rm -rf artifacts/* |