add agl-ci to flutter and html5 images

Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: Ia0aa24bd36c9b44240cae3c9600d80fc8279d1e6

diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
index 19453e1..1be4218 100644 (file)
--- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml
+++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
@@ -135,12 +135,13 @@
               kill-phase-on: FAILURE
             - name: 'ci-platform-{project}-verify-CIB-flutter-qemux86-64'
               current-parameters: true
-              abort-all-job: false
-              kill-phase-on: NEVER
+              kill-phase-on: FAILURE
             - name: 'ci-platform-{project}-verify-CIB-ic-multicontainer-qemux86-64'
               current-parameters: true
-              abort-all-job: false
-              kill-phase-on: NEVER
+              kill-phase-on: FAILURE
+            - name: 'ci-platform-{project}-verify-CIB-html5-qemux86-64'
+              current-parameters: true
+              kill-phase-on: FAILURE
       - multijob:
           name: CIB-{project}-finish-success
           condition: SUCCESSFUL
@@ -213,10 +214,6 @@
           name: 'CIBT-{project}-finish-success'
           condition: SUCCESSFUL
           projects:
-            - name: 'ci-platform-{project}-verify-CIB-html5-qemux86-64'
-              current-parameters: true
-              abort-all-job: false
-              kill-phase-on: NEVER
             - name: 'ci-platform-{project}-verify-CIBT-finish-success'
               current-parameters: true
               abort-all-job: false

diff --git a/jjb/common/include-agl-set-flutter-demo-image.sh b/jjb/common/include-agl-set-flutter-demo-image.sh
index e91cc97..c20372d 100644 (file)
--- a/jjb/common/include-agl-set-flutter-demo-image.sh
+++ b/jjb/common/include-agl-set-flutter-demo-image.sh
@@ -12,7 +12,7 @@ set -e
 # only run on master, jellyfish and icefish
 ! ( echo "marlin jellyfish lamprey koi" | grep -q $TARGETBRANCH ) || exit 0
 
-export TARGETFEATURES="agl-demo agl-devel"
+export TARGETFEATURES="agl-demo agl-devel agl-ci"
 export TARGETQA=""
 export TARGETIMAGE="agl-ivi-demo-platform-flutter"
 

diff --git a/jjb/common/include-agl-set-html5-image.sh b/jjb/common/include-agl-set-html5-image.sh
index 94a0123..80b9523 100644 (file)
--- a/jjb/common/include-agl-set-html5-image.sh
+++ b/jjb/common/include-agl-set-html5-image.sh
@@ -12,7 +12,7 @@ set -e
 # only run on master, jellyfish and icefish
 #( echo "marlin jellyfish icefish koi lamprey" | grep -q $TARGETBRANCH ) || exit 0
 
-export TARGETFEATURES="agl-demo agl-devel"
+export TARGETFEATURES="agl-demo agl-devel agl-ci"
 export TARGETQA=""
 export TARGETIMAGE="agl-demo-platform-html5"
 

diff --git a/jjb/common/include-agl-set-iceg-lxc-image.sh b/jjb/common/include-agl-set-iceg-lxc-image.sh
index f724c7f..b7de3a9 100644 (file)
--- a/jjb/common/include-agl-set-iceg-lxc-image.sh
+++ b/jjb/common/include-agl-set-iceg-lxc-image.sh
@@ -12,7 +12,7 @@ set -e
 # only run on master, jellyfish and icefish
 ! ( echo "marlin jellyfish icefish koi lamprey" | grep -q $TARGETBRANCH ) || exit 0
 
-export TARGETFEATURES="agl-ic-container agl-devel"
+export TARGETFEATURES="agl-ic-container agl-devel agl-ci"
 export TARGETQA=""
 export TARGETIMAGE="agl-cluster-demo-lxc-host"
 

diff --git a/jjb/common/include-agl-set-ivieg-flutter-image.sh b/jjb/common/include-agl-set-ivieg-flutter-image.sh
index 755bdf3..4e654cd 100644 (file)
--- a/jjb/common/include-agl-set-ivieg-flutter-image.sh
+++ b/jjb/common/include-agl-set-ivieg-flutter-image.sh
@@ -12,7 +12,7 @@ set -e
 # only run on master, jellyfish and icefish
 ( echo "marlin" | grep -q $TARGETBRANCH ) || exit 0
 
-export TARGETFEATURES="agl-flutter agl-devel"
+export TARGETFEATURES="agl-flutter agl-devel agl-ci"
 export TARGETQA=""
 export TARGETIMAGE="agl-image-flutter-debug"