Fix bug in image+feature selection.

Change-Id: Ifbe88bf159c1ee13798005e5beb4ec4a65ac56ae
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

diff --git a/jjb/common/include-agl-build.sh b/jjb/common/include-agl-build.sh
index 9c96929..c09616c 100755 (executable)
--- 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 321792c..f0b9312 100644 (file)
--- 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: