From 99f8e91d6641505e85528ca6e85b88a36888f9e6 Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Tue, 12 May 2020 17:42:47 +0200 Subject: Support the rewitten rpi4 machine file layout The reworked rpi4 board support will build with MACHINE = raspberrypi4-64 to match upstream. This leads to some paths being different on the download server. Thus we need to adapt the scripts. Signed-off-by: Jan-Simon Moeller Change-Id: Iac1e2bb8c80bb751138969653a5548c6133a665a --- utils/agljobtemplate.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'utils') diff --git a/utils/agljobtemplate.py b/utils/agljobtemplate.py index b3763dd..61fc82b 100644 --- a/utils/agljobtemplate.py +++ b/utils/agljobtemplate.py @@ -119,6 +119,8 @@ class Agljobtemplate(object): url_fragment = '' if (build_type == 'ci'): url_fragment += changeid + '/' + patchset + '/' + if not vcs_branch: + vcs_branch = 'master' elif (build_type == 'snapshot' or build_type == 'weekly' or build_type == 'daily') and (not vcs_branch and not version): vcs_branch = 'master' version = 'latest' @@ -137,6 +139,10 @@ class Agljobtemplate(object): if machine == "upsquare": machine_frag_url = "intel-corei7-64" build_name = "intel-corei7-64" + if vcs_branch == "master" and (machine == "raspberrypi4" or machine == "raspberrypi4-64"): + machine_frag_url = "raspberrypi4-64" + build_name = "raspberrypi4" + job['yocto_machine'] = "raspberrypi4-64" url_fragment += build_name if (build_type != 'ci'): -- cgit 1.2.3-korg