aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-12-16 00:45:19 +0100
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-12-16 00:45:19 +0100
commit2b26c465e81886f6dad1546538143ed976969367 (patch)
treef3a0db08f54ee439e494a6895d5221c081708230
parentc934abbf77a57a02cb75ba773e9070318fa8407d (diff)
Only apply refhw on master for now
Change-Id: I1be3fae31cb858b0f2b346d06abd26abc78bdaeb Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
-rw-r--r--jjb/common/include-agl-header.sh4
-rw-r--r--jjb/common/include-agl-run-test-prepare.sh2
2 files changed, 6 insertions, 0 deletions
diff --git a/jjb/common/include-agl-header.sh b/jjb/common/include-agl-header.sh
index d62e5b1f..1b7b31d2 100644
--- a/jjb/common/include-agl-header.sh
+++ b/jjb/common/include-agl-header.sh
@@ -154,7 +154,11 @@ fi
# h3ulcb-nogfx means no graphic drivers
if test x"h3ulcb-nogfx" = x"$MACHINE"; then
export TARGETIMAGE=${TARGETIMAGEnogfx}
+ if test x"master" = x"${TARGETBRANCH}" ; then
export TARGETFEATURES="${TARGETFEATURESnogfx} agl-refhw-h3"
+ else
+ export TARGETFEATURES="${TARGETFEATURESnogfx}"
+ fi
export TARGETMACHINE="h3ulcb"
export TARGETSDKIMAGE="agl-image-ivi-crosssdk"
fi
diff --git a/jjb/common/include-agl-run-test-prepare.sh b/jjb/common/include-agl-run-test-prepare.sh
index 33e64801..539bf45b 100644
--- a/jjb/common/include-agl-run-test-prepare.sh
+++ b/jjb/common/include-agl-run-test-prepare.sh
@@ -102,9 +102,11 @@ h3ulcb-nogfx)
lava_device=r8a7795-h3ulcb-kf
releng_device=h3ulcb-kf
gen_info || exit 0
+ if test x"master" = x"${TARGETBRANCH}" ; then
lava_device=r8a7795-agl-refhw
releng_device=r8a7795-agl-refhw
gen_info || exit 0
+ fi
;;
upsquare)
lava_device=upsquare