Put machine_type in config.yaml

Reason being, if --worker is passed to teuthology-schedule, we are
already placing the job in the tube for that machine type. If the job
config doesn't specify a machine_type, it will later be assigned to
'plana' by teuthology-run without actually modifying the config. This
can result in jobs running on hardware other than what was requested.

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>

diff --git a/teuthology/schedule.py b/teuthology/schedule.py
index d9b71fe8bde6831e793663ca81a10856a820296a..5aa51ed8cfe829dec836a9c8a05f5450c363ee60 100644 (file)
--- a/teuthology/schedule.py
+++ b/teuthology/schedule.py
@@ -47,6 +47,7 @@ def main(ctx):
         description=ctx.description,
         owner=ctx.owner,
         verbose=ctx.verbose,
+        machine_type=ctx.worker,
     )
     # Merge job_config and ctx.config
     job_config.update(ctx.config)