ci/lava: Pass JWT separately from environment variables

As the JWT is sensitive, we don't want to record or leak it anywhere.
Doing this lets us run --dump-yaml in normal execution so we can
artifact the result, as well as bringing us into line with bare-metal.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11309>
This commit is contained in:
Daniel Stone
2021-06-10 11:26:38 +01:00
committed by Marge Bot
parent 5793cefff8
commit f3d69923a1
3 changed files with 10 additions and 4 deletions

View File

@@ -67,10 +67,13 @@ def generate_lava_yaml(args):
values['env_vars'] = env_vars
values['deqp_version'] = args.deqp_version
yaml = template.render(values)
if args.dump_yaml:
print(yaml)
dump_values = values
dump_values['jwt'] = 'xxx'
print(template.render(dump_values))
values['jwt'] = args.jwt
yaml = template.render(values)
return yaml
@@ -208,6 +211,7 @@ if __name__ == '__main__':
parser.add_argument("--boot-method")
parser.add_argument("--lava-tags", nargs='?', default="")
parser.add_argument("--env-vars", nargs='?', default="")
parser.add_argument("--jwt")
parser.add_argument("--deqp-version")
parser.add_argument("--ci-node-index")
parser.add_argument("--ci-node-total")