diff options
Diffstat (limited to 'jjb/common')
| -rw-r--r-- | jjb/common/include-agl-header.sh | 6 | ||||
| -rw-r--r-- | jjb/common/include-agl-set-html5-image.sh | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/jjb/common/include-agl-header.sh b/jjb/common/include-agl-header.sh index 565cb1f8..5ca80bdb 100644 --- a/jjb/common/include-agl-header.sh +++ b/jjb/common/include-agl-header.sh @@ -158,11 +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"marlin" = x"${TARGETBRANCH}" -o x"lamprey" = x"${TARGETBRANCH}" -o x"koi" = x"${TARGETBRANCH}"; then - export TARGETFEATURES="${TARGETFEATURESnogfx} agl-refhw-h3" - else - export TARGETFEATURES="${TARGETFEATURESnogfx}" - fi + export TARGETFEATURES="${TARGETFEATURESnogfx} agl-refhw-h3" export TARGETMACHINE="h3ulcb" fi set +x diff --git a/jjb/common/include-agl-set-html5-image.sh b/jjb/common/include-agl-set-html5-image.sh index da620c0f..94a01234 100644 --- 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 "marlin jellyfish icefish koi lamprey" | grep -q $TARGETBRANCH ) || exit 0 +#( echo "marlin jellyfish icefish koi lamprey" | grep -q $TARGETBRANCH ) || exit 0 export TARGETFEATURES="agl-demo agl-devel" export TARGETQA="" |