updates for octopus

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

diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
index 19ebb7d..19453e1 100644 (file)
--- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml
+++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
@@ -213,11 +213,11 @@
           name: 'CIBT-{project}-finish-success'
           condition: SUCCESSFUL
           projects:
-            - name: 'ci-platform-{project}-verify-CIBT-finish-success'
+            - 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-CIB-html5-qemux86-64'
+            - name: 'ci-platform-{project}-verify-CIBT-finish-success'
               current-parameters: true
               abort-all-job: false
               kill-phase-on: NEVER

diff --git a/jjb/common/include-agl-header.sh b/jjb/common/include-agl-header.sh
index 2380492..9b478c0 100644 (file)
--- a/jjb/common/include-agl-header.sh
+++ b/jjb/common/include-agl-header.sh
@@ -187,7 +187,7 @@ fi
 
 
 ##### needlefish integration
-if test x"master" = x"${TARGETBRANCH}" -o x"needlefish" = x"${TARGETBRANCH}" ; then
+if test x"master" = x"${TARGETBRANCH}" -o x"octopus" = x"${TARGETBRANCH}" -o x"needlefish" = x"${TARGETBRANCH}" ; then
     if test x"bbe" = x"${TARGETMACHINE}" ; then
       echo "Target only works for TELEMATICS PROFILE. Select this:"
       echo "TARGETFEATURES=\"${TARGETFEATURESnogfx}\""
@@ -197,4 +197,4 @@ if test x"master" = x"${TARGETBRANCH}" -o x"needlefish" = x"${TARGETBRANCH}" ; t
       TARGETIMAGE="agl-telematics-demo-platform"
       TARGETSDKIMAGE="agl-telematics-demo-platform"
     fi
-fi
\ No newline at end of file
+fi

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

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