From: Jan-Simon Möller Date: Tue, 15 Dec 2020 23:45:19 +0000 (+0100) Subject: Only apply refhw on master for now X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=2b26c465e81886f6dad1546538143ed976969367;p=ci-management.git Only apply refhw on master for now Change-Id: I1be3fae31cb858b0f2b346d06abd26abc78bdaeb Signed-off-by: Jan-Simon Möller --- 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