From 0476469c1b5272b7a76b22082f0cd44eab24dc22 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Mon, 8 Apr 2019 15:19:49 +0200 Subject: Permit to generate jobs for the upsquare This patch adds suppport for the upsquare. Upsquare use a GRUB boot method, so we needed to add a new generic-grub-tftp boot template. Since all x86_64 use the same yocto generated build name, we add a new upsquare machine, but tweaked a bit utils/agljobtemplate.py to keep intel-corei7-64 everywhere (except for the LAVA device-type). Bug-AGL: SPEC-2075 Change-Id: I15c850fada53efbcda4fd58527d7b7414865f89d Signed-off-by: Corentin LABBE --- utils/agljobtemplate.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'utils/agljobtemplate.py') diff --git a/utils/agljobtemplate.py b/utils/agljobtemplate.py index 0dcafb5..691b54f 100644 --- a/utils/agljobtemplate.py +++ b/utils/agljobtemplate.py @@ -122,10 +122,12 @@ class Agljobtemplate(object): else: url_fragment += vcs_branch + '/' + version + '/' + machine_frag_url = machine if (machine == 'm3ulcb') or (machine == 'porter'): - url_fragment += machine + '-nogfx' - else: - url_fragment += machine + machine_frag_url = machine + '-nogfx' + if machine == "upsquare": + machine_frag_url = "intel-corei7-64" + url_fragment += machine_frag_url if (build_type != 'ci'): url_fragment += '/deploy/images/' + machine -- cgit 1.2.3-korg