6 files changed, 15 insertions, 15 deletions
diff --git a/jjb/common/include-agl-header.sh b/jjb/common/include-agl-header.sh
index 90ee0ce8..3a8431a5 100644
--- a/jjb/common/include-agl-header.sh
+++ b/jjb/common/include-agl-header.sh
@@ -33,10 +33,10 @@ export TARGETFEATURESnogfx="agl-ci-change-features-nogfx agl-ci"
 export TARGETFEATURES="agl-ci-change-features agl-ci"
 
 export TARGETQA=""
-export TARGETIMAGE="agl-ivi-demo-qt"
-export TARGETIMAGEnogfx="agl-ivi-demo-qt"
+export TARGETIMAGE="agl-ivi-demo-qt agl-ivi-demo-flutter"
+export TARGETIMAGEnogfx="agl-ivi-demo-qt agl-ivi-demo-flutter"
 
-export TARGETSDKIMAGE="agl-ivi-demo-qt-crosssdk"
+export TARGETSDKIMAGE="agl-ivi-demo-qt agl-ivi-demo-flutter"
 
 
 # apply GERRIT_*
@@ -116,8 +116,8 @@ while getopts ":b:i:p:r:dnqvx" opt; do
 done
 
 # expand
-eval TARGETIMAGE="$TARGETIMAGE"
-eval TARGETIMAGEnogfx="$TARGETIMAGEnogfx"
+#eval TARGETIMAGE="$TARGETIMAGE"
+#eval TARGETIMAGEnogfx="$TARGETIMAGEnogfx"
 
 # The 'real' machine name
 export TARGETMACHINE=${MACHINE}
diff --git a/jjb/common/include-agl-set-compositor-image.sh b/jjb/common/include-agl-set-compositor-image.sh
index 2ecae44e..0e5ec635 100644
--- a/jjb/common/include-agl-set-compositor-image.sh
+++ b/jjb/common/include-agl-set-compositor-image.sh
@@ -14,8 +14,8 @@ export TARGETFEATURES="agl-demo agl-devel agl-netboot"
 export TARGETQA=""
 export TARGETIMAGE="agl-ivi-demo-platform"
 
-eval TARGETIMAGE="$TARGETIMAGE"
-eval TARGETIMAGEnogfx="$TARGETIMAGE"
+#eval TARGETIMAGE="$TARGETIMAGE"
+#eval TARGETIMAGEnogfx="$TARGETIMAGE"
 
 #if $DEBUG; then
 set | grep ^TARGET || true
diff --git a/jjb/common/include-agl-set-flutter-demo-image.sh b/jjb/common/include-agl-set-flutter-demo-image.sh
index 7b97a081..20e02d92 100644
--- a/jjb/common/include-agl-set-flutter-demo-image.sh
+++ b/jjb/common/include-agl-set-flutter-demo-image.sh
@@ -13,8 +13,8 @@ export TARGETFEATURES="agl-demo agl-devel agl-ci"
 export TARGETQA=""
 export TARGETIMAGE="agl-ivi-demo-flutter"
 
-eval TARGETIMAGE="$TARGETIMAGE"
-eval TARGETIMAGEnogfx="$TARGETIMAGE"
+#TARGETIMAGE="$TARGETIMAGE"
+TARGETIMAGEnogfx="$TARGETIMAGE"
 
 #if $DEBUG; then
 set | grep ^TARGET || true
diff --git a/jjb/common/include-agl-set-html5-image.sh b/jjb/common/include-agl-set-html5-image.sh
index d33fb936..39ac9357 100644
--- a/jjb/common/include-agl-set-html5-image.sh
+++ b/jjb/common/include-agl-set-html5-image.sh
@@ -13,8 +13,8 @@ export TARGETFEATURES="agl-demo agl-devel agl-ci"
 export TARGETQA=""
 export TARGETIMAGE="agl-ivi-demo-html5"
 
-eval TARGETIMAGE="$TARGETIMAGE"
-eval TARGETIMAGEnogfx="$TARGETIMAGE"
+#TARGETIMAGE="$TARGETIMAGE"
+TARGETIMAGEnogfx="$TARGETIMAGE"
 
 #if $DEBUG; then
 set | grep ^TARGET || true
diff --git a/jjb/common/include-agl-set-iceg-lxc-image.sh b/jjb/common/include-agl-set-iceg-lxc-image.sh
index 33b48394..052b4c4c 100644
--- a/jjb/common/include-agl-set-iceg-lxc-image.sh
+++ b/jjb/common/include-agl-set-iceg-lxc-image.sh
@@ -13,8 +13,8 @@ export TARGETFEATURES="agl-ic-container agl-devel agl-ci"
 export TARGETQA=""
 export TARGETIMAGE="agl-cluster-demo-lxc-host"
 
-eval TARGETIMAGE="$TARGETIMAGE"
-eval TARGETIMAGEnogfx="$TARGETIMAGE"
+#TARGETIMAGE="$TARGETIMAGE"
+TARGETIMAGEnogfx="$TARGETIMAGE"
 
 #if $DEBUG; then
 set | grep ^TARGET || true
diff --git a/jjb/common/include-agl-set-ivieg-flutter-image.sh b/jjb/common/include-agl-set-ivieg-flutter-image.sh
index 4e654cdd..956a64d6 100644
--- a/jjb/common/include-agl-set-ivieg-flutter-image.sh
+++ b/jjb/common/include-agl-set-ivieg-flutter-image.sh
@@ -16,8 +16,8 @@ export TARGETFEATURES="agl-flutter agl-devel agl-ci"
 export TARGETQA=""
 export TARGETIMAGE="agl-image-flutter-debug"
 
-eval TARGETIMAGE="$TARGETIMAGE"
-eval TARGETIMAGEnogfx="$TARGETIMAGE"
+#TARGETIMAGE="$TARGETIMAGE"
+TARGETIMAGEnogfx="$TARGETIMAGE"
 
 #if $DEBUG; then
 set | grep ^TARGET || true