SPEC-3811: rpi4 default TARGETMACHINE to raspberrypi4-64

The TARGETMACHINE of rpi4 should be raspberrypi4-64.
Only halibut should keep the old one.

Change-Id: Ifccc863ef34576acb6677504886aa140337590d6
Bug-AGL: SPEC-3811
Signed-off-by: Corentin LABBE <clabbe@baylibre.com>

diff --git a/jjb/common/include-agl-header.sh b/jjb/common/include-agl-header.sh
index f925f56..b11dd04 100644 (file)
--- a/jjb/common/include-agl-header.sh
+++ b/jjb/common/include-agl-header.sh
@@ -167,14 +167,11 @@ if test x"h3ulcb-nogfx" = x"$MACHINE"; then
 fi
 set +x
 
-if test x"raspberrypi4" = x"${MACHINE}" -a x"master" = x"${TARGETBRANCH}" ; then
-    export TARGETMACHINE="raspberrypi4-64"
-fi
-if test x"raspberrypi4" = x"${MACHINE}" -a x"jellyfish" = x"${TARGETBRANCH}" ; then
-    export TARGETMACHINE="raspberrypi4-64"
-fi
-if test x"raspberrypi4" = x"${MACHINE}" -a x"koi" = x"${TARGETBRANCH}" ; then
+if test x"raspberrypi4" = x"${MACHINE}" ; then
     export TARGETMACHINE="raspberrypi4-64"
+    if test x"halibut" = x"${TARGETBRANCH}" ; then
+        export TARGETMACHINE="raspberrypi4"
+    fi
 fi
 
 #if $DEBUG; then