Use the generic qemu* toolchains for the applications

We no longer need to pick a specific board for an architecture.
All supported architecture (x86-64, arm, aarch64) have now a
qemu target and a matching toolchain.

Bug-AGL: SPEC-2540

Change-Id: I4f77acb10c1e35e745e2a2c11aee1f8f49cb96ab
Signed-off-by: build.automotivelinux.org <jenkins@automotivelinux.org>

diff --git a/jjb/ci-apps-verify/ci-apps-jjb.yaml b/jjb/ci-apps-verify/ci-apps-jjb.yaml
index 45f88c8..1fccd1b 100644 (file)
--- a/jjb/ci-apps-verify/ci-apps-jjb.yaml
+++ b/jjb/ci-apps-verify/ci-apps-jjb.yaml
@@ -7,7 +7,7 @@
       - flounder
     architecture:
       - aarch64
-        #= dragonboard-410c (disabled for dab atm)
+        #= dragonboard-410c (disabled for dab atm) later versions use qemuarm64
       - x86-64
         #= intel-corei7-64
         #= qemux86-64

diff --git a/jjb/common/include-apps-fetch-install-sdk.sh b/jjb/common/include-apps-fetch-install-sdk.sh
index 49fb27b..42847c4 100644 (file)
--- a/jjb/common/include-apps-fetch-install-sdk.sh
+++ b/jjb/common/include-apps-fetch-install-sdk.sh
@@ -15,6 +15,11 @@ SDKHOSTDIR="~/agl-sdk"
 # should probably switch to release ... or multiple (release/snapshot) fwiw
 if test x"" = x"$AGLBRANCH"; then echo "AGLBRANCH not set, quitting" ; exit 1 ; fi
 
+if test x"albacore" = x"$AGLBRANCH"; then echo "Unsupported branch"; exit 0; fi
+if test x"blowfish" = x"$AGLBRANCH"; then echo "Unsupported branch"; exit 0; fi
+if test x"chinook" = x"$AGLBRANCH"; then echo "Unsupported branch"; exit 0; fi
+if test x"dab" = x"$AGLBRANCH"; then echo "Unsupported branch"; exit 0; fi
+
 # default to release
 SDKBASEURL="http://download.automotivelinux.org/AGL/release/${AGLBRANCH}/latest/${TARGETSDKMACHINE}/deploy/sdk/"
 
@@ -24,8 +29,8 @@ if test x"master" = x"$AGLBRANCH" ; then
 fi
 # special case for dab
 if test x"dab" = x"$AGLBRANCH" ; then
-  if test x"dragonboard-410c" = x"$TARGETSDKMACHINE"; then
-      echo "Skipping dragonboard-410c/aarch64 .... "
+  if test x"qemuarm64" = x"$TARGETSDKMACHINE"; then
+      echo "Skipping aarch64 .... "
       exit 0
   fi
   SDKBASEURL="http://download.automotivelinux.org/AGL/release/dab/latest/${TARGETSDKMACHINE}/deploy/sdk/"

diff --git a/jjb/common/include-apps-header.sh b/jjb/common/include-apps-header.sh
index e04ec86..22c9b6a 100644 (file)
--- a/jjb/common/include-apps-header.sh
+++ b/jjb/common/include-apps-header.sh
@@ -104,7 +104,7 @@ fi
 case "$TARGETARCH" in 
        arm)
            export TARGETSDKARCH="armv7ve.*hf-neon-vfpv4"
-           export TARGETSDKMACHINE="raspberrypi3"
+           export TARGETSDKMACHINE="qemuarm"
            ;;
        x86-64)
            export TARGETSDKARCH="corei7-64"
@@ -112,7 +112,7 @@ case "$TARGETARCH" in
            ;;
        aarch64)
            export TARGETSDKARCH="aarch64"
-           export TARGETSDKMACHINE="dragonboard-410c"
+           export TARGETSDKMACHINE="qemuarm64"
            ;;
 esac