aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2016-11-07 11:08:12 +0100
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2016-11-07 11:08:12 +0100
commitcb44fe25cc827eeb23a5681f2b34e66066644b0b (patch)
tree5ea4c367d333c902feb199afcab54f75aa896c55
parentdf8e4bccf94ee005c2234c6c3d3607b9c6274a4f (diff)
Fix bug in image+feature selection.
Change-Id: Ifbe88bf159c1ee13798005e5beb4ec4a65ac56ae Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
-rwxr-xr-xjjb/common/include-agl-build.sh6
-rw-r--r--jjb/release-jjb-blowfish-snapshot/release-jjb-blowfish-snapshot.yaml2
2 files changed, 5 insertions, 3 deletions
diff --git a/jjb/common/include-agl-build.sh b/jjb/common/include-agl-build.sh
index 9c96929f..c09616c1 100755
--- a/jjb/common/include-agl-build.sh
+++ b/jjb/common/include-agl-build.sh
@@ -111,10 +111,12 @@ eval TARGETIMAGE="$TARGETIMAGE"
eval TARGETIMAGEnogfx="$TARGETIMAGEnogfx"
if $NOGFX; then
- export TARGETIMAGE=${TARGETIMAGEnogfx}
+ export TARGETIMAGE="${TARGETIMAGEnogfx}"
+ export TARGETFEATURES="${TARGETFEATURESnogfx}"
fi
if test x"porter-nogfx" = x"$MACHINE"; then
- export TARGETIMAGE=${TARGETIMAGEnogfx}
+ export TARGETIMAGE="${TARGETIMAGEnogfx}"
+ export TARGETFEATURES="${TARGETFEATURESnogfx}"
fi
if $DEBUG; then
diff --git a/jjb/release-jjb-blowfish-snapshot/release-jjb-blowfish-snapshot.yaml b/jjb/release-jjb-blowfish-snapshot/release-jjb-blowfish-snapshot.yaml
index 321792c2..f0b93126 100644
--- a/jjb/release-jjb-blowfish-snapshot/release-jjb-blowfish-snapshot.yaml
+++ b/jjb/release-jjb-blowfish-snapshot/release-jjb-blowfish-snapshot.yaml
@@ -24,7 +24,7 @@
description: "refspec to build"
- string:
name: UPLOAD
- default: false
+ default: NO
description: "Upload?"
axes:
- axis: