From 43d83cd0d89962537dd937cdcf34dd0597c33f68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Roukala=20=28n=C3=A9=20Peres=29?= Date: Fri, 9 Jun 2023 13:21:01 +0300 Subject: [PATCH] ci/b2c: select the DUT to run on by name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When we have many DUTs with the same tags (or subset of tags), it is possible for the gitlab runner name not to match the DUT picked by valve-infra's executor. This is needlessly confusing, and prevents specifically tagging some runners with a low-priority tag but still have these runners execute high-priority jobs... because a low priority job may get started by gitlab but the corresponding DUT is being used by a high-priority task. To fix this, simply tell the executor which DUT we want, not just the list of tags we want. Signed-off-by: Martin Roukala (né Peres) Part-of: --- .gitlab-ci/test/gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index b857e09ed2a..2e46ae1fe5c 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -368,7 +368,7 @@ clang-format: # Submit the job to Valve's CI gateway service with the CI # provisioned job_folder. env PYTHONUNBUFFERED=1 executorctl \ - run -w b2c.yml.jinja2 -j $(slugify "$CI_JOB_NAME") -s ${JOB_FOLDER} + run -w b2c.yml.jinja2 -j $(slugify "$CI_JOB_NAME") -s ${JOB_FOLDER} -i "$CI_RUNNER_DESCRIPTION" # Anything our job places in results/ will be collected by the # Gitlab coordinator for status presentation. results/junit.xml