Updates for needlefish

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

6 files changed, 8 insertions, 19 deletions

diff --git a/jjb/ci-AGL-refhw-verify/ci-platform-refhw-jjb.yaml b/jjb/ci-AGL-refhw-verify/ci-platform-refhw-jjb.yaml
index bfd3a651..79900be9 100644
--- a/jjb/ci-AGL-refhw-verify/ci-platform-refhw-jjb.yaml
+++ b/jjb/ci-AGL-refhw-verify/ci-platform-refhw-jjb.yaml
@@ -276,7 +276,6 @@
           - ../common/include-agl-run-test-prepare.sh
           - ../common/include-agl-run-test-rsync-changeid.sh
           - ../common/include-agl-setup-and-bitbake-ivi-image.sh
-          - ../common/include-agl-kci-publish-build-meta.sh
       - conditional-step:
           condition-kind: always
           steps:
diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
index 7f2c8ec0..25adcd21 100644
--- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml
+++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
@@ -131,6 +131,10 @@
             - name: 'ci-platform-{project}-verify-CIB-raspberrypi4'
               current-parameters: true
               kill-phase-on: FAILURE
+            - name: 'ci-platform-{project}-verify-CIB-html5-qemux86-64'
+              current-parameters: true
+              abort-all-job: false
+              kill-phase-on: NEVER
       - multijob:
           name: CIB-{project}-finish-success
           condition: SUCCESSFUL
@@ -207,14 +211,6 @@
               current-parameters: true
               abort-all-job: false
               kill-phase-on: NEVER
-      #- multijob:
-      #    name: CIB-{project}-extra-variants
-      #    condition: COMPLETED
-      #    projects:
-      #      - name: 'ci-platform-{project}-verify-CIB-html5-qemux86-64'
-      #         current-parameters: true
-      #         abort-all-job: false
-      #         kill-phase-on: NEVER
 
     publishers:
       - trigger-parameterized-builds:
@@ -345,7 +341,6 @@
           - ../common/include-agl-run-test-prepare.sh
           - ../common/include-agl-run-test-rsync-changeid.sh
           - ../common/include-agl-setup-and-bitbake-ivi-image.sh
-          - ../common/include-agl-kci-publish-build-meta.sh
       - conditional-step:
           condition-kind: always
           steps:
diff --git a/jjb/ci-apps-verify/ci-apps-jjb.yaml b/jjb/ci-apps-verify/ci-apps-jjb.yaml
index 7de9694d..17a0b5da 100644
--- a/jjb/ci-apps-verify/ci-apps-jjb.yaml
+++ b/jjb/ci-apps-verify/ci-apps-jjb.yaml
@@ -206,7 +206,6 @@
           - ../common/include-apps-header.sh
           - ../common/include-apps-fetch-install-sdk.sh
           - ../common/include-apps-build-app.sh
-          - ../common/include-agl-kci-publish-build-meta.sh
           - ../common/include-apps-prepare-upload-folder.sh
           - ../common/include-apps-rsync-download-changeid.sh
       - conditional-step:
diff --git a/jjb/common/include-agl-header.sh b/jjb/common/include-agl-header.sh
index 565cb1f8..5ca80bdb 100644
--- a/jjb/common/include-agl-header.sh
+++ b/jjb/common/include-agl-header.sh
@@ -158,11 +158,7 @@ if test x"h3ulcb-nogfx" = x"$MACHINE"; then
         export TARGETIMAGE=${TARGETIMAGEnogfx}
         export TARGETSDKIMAGE="agl-image-ivi-crosssdk"
     fi
-    if test x"master" = x"${TARGETBRANCH}" -o x"marlin" = x"${TARGETBRANCH}" -o x"lamprey" = x"${TARGETBRANCH}" -o x"koi" = x"${TARGETBRANCH}"; then
-        export TARGETFEATURES="${TARGETFEATURESnogfx} agl-refhw-h3"
-    else
-        export TARGETFEATURES="${TARGETFEATURESnogfx}"
-    fi
+    export TARGETFEATURES="${TARGETFEATURESnogfx} agl-refhw-h3"
     export TARGETMACHINE="h3ulcb"
 fi
 set +x
diff --git a/jjb/common/include-agl-set-html5-image.sh b/jjb/common/include-agl-set-html5-image.sh
index da620c0f..94a01234 100644
--- a/jjb/common/include-agl-set-html5-image.sh
+++ b/jjb/common/include-agl-set-html5-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-demo agl-devel"
 export TARGETQA=""
diff --git a/jjb/pre-fetch/include-prefetch.sh b/jjb/pre-fetch/include-prefetch.sh
index 6d15ba99..04b399f8 100644
--- a/jjb/pre-fetch/include-prefetch.sh
+++ b/jjb/pre-fetch/include-prefetch.sh
@@ -3,9 +3,9 @@
 #set -x
 set +e
 #
-export BOARDS="qemux86-64 raspberrypi4 raspberrypi3 intel-corei7-64 h3ulcb-nogfx m3ulcb-nogfx dra7xx-evm qemuarm qemuarm64 bbe"
+export BOARDS="qemux86-64 raspberrypi4 h3ulcb-nogfx m3ulcb-nogfx dra7xx-evm qemuarm qemuarm64 bbe"
 # check: dra7xx-evm dragonboard-410c wandboard
-export FEATURES="agl-demo agl-devel agl-netboot agl-profile-graphical-html5"
+export FEATURES="agl-demo agl-devel agl-netboot"
 export FEATURES_nogfx="agl-netboot agl-devel"
 export TARGETIMAGE="agl-demo-platform-crosssdk"
 export TARGETIMAGE_nogfx="agl-image-minimal"