diff options
-rw-r--r-- | jjb/ci-AGL-verify/ci-platform-jjb.yaml | 13 | ||||
-rw-r--r-- | jjb/common/include-agl-set-flutter-demo-image.sh | 2 | ||||
-rw-r--r-- | jjb/common/include-agl-set-html5-image.sh | 2 | ||||
-rw-r--r-- | jjb/common/include-agl-set-iceg-lxc-image.sh | 2 | ||||
-rw-r--r-- | jjb/common/include-agl-set-ivieg-flutter-image.sh | 2 |
5 files changed, 9 insertions, 12 deletions
diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml index 19453e13..1be42184 100644 --- 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 e91cc971..c20372de 100644 --- 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 94a01234..80b95231 100644 --- 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 f724c7f1..b7de3a97 100644 --- 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 755bdf33..4e654cdd 100644 --- 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" |