Updates for LL branch

Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I41fd76d4077fc105f816727366aeb662a2a2afe8

diff --git a/jjb/ci-apps-verify/ci-apps-jjb.yaml b/jjb/ci-apps-verify/ci-apps-jjb.yaml
index 1a2bdb3..da0ee16 100644 (file)
--- a/jjb/ci-apps-verify/ci-apps-jjb.yaml
+++ b/jjb/ci-apps-verify/ci-apps-jjb.yaml
@@ -6,6 +6,7 @@
       - icefish
       - jellyfish
       - koi
+      - lamprey
     architecture:
       - aarch64
       - x86-64

diff --git a/jjb/common/include-agl-header.sh b/jjb/common/include-agl-header.sh
index b11dd04..077aa1b 100644 (file)
--- a/jjb/common/include-agl-header.sh
+++ b/jjb/common/include-agl-header.sh
@@ -158,7 +158,7 @@ if test x"h3ulcb-nogfx" = x"$MACHINE"; then
         export TARGETIMAGE=${TARGETIMAGEnogfx}
         export TARGETSDKIMAGE="agl-image-ivi-crosssdk"
     fi
-    if test x"master" = x"${TARGETBRANCH}" -o x"koi" = x"${TARGETBRANCH}"; then
+    if test x"master" = x"${TARGETBRANCH}" -o x"lamprey" = x"${TARGETBRANCH}" -o x"koi" = x"${TARGETBRANCH}"; then
         export TARGETFEATURES="${TARGETFEATURESnogfx} agl-refhw-h3"
     else
         export TARGETFEATURES="${TARGETFEATURESnogfx}"

diff --git a/jjb/common/include-agl-run-test-prepare.sh b/jjb/common/include-agl-run-test-prepare.sh
index 15b2b84..a705309 100644 (file)
--- a/jjb/common/include-agl-run-test-prepare.sh
+++ b/jjb/common/include-agl-run-test-prepare.sh
@@ -105,7 +105,7 @@ qemuarm64)
        gen_info || exit 0
 ;;
 h3ulcb-nogfx)
-       if test x"master" = x"${TARGETBRANCH}" -o x"koi" = x"${TARGETBRANCH}"; then
+       if test x"master" = x"${TARGETBRANCH}" -o x"lamprey" = x"${TARGETBRANCH}" -o x"koi" = x"${TARGETBRANCH}"; then
        lava_device=r8a7795-agl-refhw
        releng_device=r8a7795-agl-refhw
        gen_info || exit 0

diff --git a/jjb/common/include-agl-set-compositor-image.sh b/jjb/common/include-agl-set-compositor-image.sh
index 10b6c7e..456b65d 100644 (file)
--- a/jjb/common/include-agl-set-compositor-image.sh
+++ b/jjb/common/include-agl-set-compositor-image.sh
@@ -10,7 +10,7 @@ set -e
 ################################################################################
 
 # only run on master, jellyfish and icefish
-( echo "master jellyfish icefish koi" | grep -q $TARGETBRANCH ) || exit 0
+( echo "master jellyfish icefish koi lamprey" | grep -q $TARGETBRANCH ) || exit 0
 
 # Use the agl-compositor
 export TARGETFEATURES="agl-demo agl-devel agl-netboot"

diff --git a/jjb/common/include-agl-set-html5-image.sh b/jjb/common/include-agl-set-html5-image.sh
index 27188eb..33019c3 100644 (file)
--- a/jjb/common/include-agl-set-html5-image.sh
+++ b/jjb/common/include-agl-set-html5-image.sh
@@ -10,7 +10,7 @@ set -e
 ################################################################################
 
 # only run on master, jellyfish and icefish
-( echo "master jellyfish icefish koi" | grep -q $TARGETBRANCH ) || exit 0
+( echo "master jellyfish icefish koi lamprey" | grep -q $TARGETBRANCH ) || exit 0
 
 export TARGETFEATURES="agl-demo agl-devel"
 export TARGETQA=""

diff --git a/jjb/common/include-apps-header.sh b/jjb/common/include-apps-header.sh
index cb116fb..d71fcc3 100644 (file)
--- a/jjb/common/include-apps-header.sh
+++ b/jjb/common/include-apps-header.sh
@@ -109,7 +109,7 @@ case "$TARGETARCH" in
        x86-64)
            export TARGETSDKARCH="corei7-64"
            # starting with master, we use qemu for the SDK.
-           if test x"master" = x"$AGLBRANCH" -o x"jellyfish" = x"${AGLBRANCH}" -o x"koi" = x"${AGLBRANCH}" ; then
+           if test x"master" = x"$AGLBRANCH" -o x"jellyfish" = x"${AGLBRANCH}" -o x"lamprey" = x"${AGLBRANCH}" -o x"koi" = x"${AGLBRANCH}" ; then
                export TARGETSDKMACHINE="qemux86-64"
            else
                export TARGETSDKMACHINE="intel-corei7-64"