Add flutter and iceg images for qemux86-64

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

4 files changed, 170 insertions, 14 deletions

diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
index 25adcd21..4021afee 100644
--- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml
+++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
@@ -9,7 +9,7 @@
       - qemuarm64
       - raspberrypi4
     testmachine:
-      - bbe
+      #- bbe
       - h3ulcb-nogfx
       - qemux86-64
       - qemuarm
@@ -28,6 +28,8 @@
       # - ci-platform-{project}-verify-CIB-start             #unused
       - ci-platform-{project}-verify-CIB-{machine}
       - ci-platform-{project}-verify-CIB-html5-qemux86-64
+      - ci-platform-{project}-verify-CIB-flutter-qemux86-64
+      - ci-platform-{project}-verify-CIB-ic-multicontainer-qemux86-64
       - ci-platform-{project}-verify-CIB-finish-success
       - ci-platform-{project}-verify-failure
       # - ci-platform-{project}-verify-CIBT-start            #unused
@@ -92,14 +94,14 @@
           export TRIGGERURL=$(echo ${{BUILD_URL}} | sed -e 's,-CIB-start.*,,')
           echo \$TRIGGERURL
           ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified=0 -n NONE --message="CI-cycle\ started.\ URL:\ ${{BUILD_URL}}" || true
-          # - multijob:
-          #     name: CIB-{project}-start
-          #     condition: SUCCESSFUL
-          #     projects:
-          #       - name: 'ci-platform-{project}-verify-CIB-start'
-          #         current-parameters: true
-          #         abort-all-job: true
-          #         kill-phase-on: FAILURE
+      # - multijob:
+      #     name: CIB-{project}-start
+      #     condition: SUCCESSFUL
+      #     projects:
+      #       - name: 'ci-platform-{project}-verify-CIB-start'
+      #         current-parameters: true
+      #         abort-all-job: true
+      #         kill-phase-on: FAILURE
       - multijob:
           name: CIB-{project}-touchstone
           condition: SUCCESSFUL
@@ -114,7 +116,7 @@
           projects:
             - name: 'ci-platform-{project}-verify-CIB-bbe'
               current-parameters: true
-              #abort-all-job: true
+              abort-all-job: false
               kill-phase-on: NEVER
             - name: 'ci-platform-{project}-verify-CIB-qemuarm'
               current-parameters: true
@@ -135,6 +137,14 @@
               current-parameters: true
               abort-all-job: false
               kill-phase-on: NEVER
+            - name: 'ci-platform-{project}-verify-CIB-flutter-qemux86-64'
+              current-parameters: true
+              abort-all-job: false
+              kill-phase-on: NEVER
+            - name: 'ci-platform-{project}-verify-CIB-ic-multicontainer-qemux86-64'
+              current-parameters: true
+              abort-all-job: false
+              kill-phase-on: NEVER
       - multijob:
           name: CIB-{project}-finish-success
           condition: SUCCESSFUL
@@ -359,7 +369,7 @@
 
 ################################################################################
 ################################################################################
-# html5-verify-CIB-{machine}  = build for machine
+# html5-verify-CIB-html5  = build for html5
 ################################################################################
 - job-template:
     name: 'ci-platform-{project}-verify-CIB-html5-qemux86-64'
@@ -424,6 +434,126 @@
                 - ../common/include-agl-get-cost.sh
 
 ################################################################################
+################################################################################
+# html5-verify-CIB-flutter-qemux86-64  = build for flutter
+################################################################################
+- job-template:
+    name: 'ci-platform-{project}-verify-CIB-flutter-qemux86-64'
+    project-type: freestyle
+    concurrent: true
+    node: agl-test-slave
+    description: "Managed by JJB. Do not Edit. \
+                  <br>Build time graph:<br><img src='buildTimeGraph/png' />"
+    parameters:
+      - string:
+          name: GERRIT_PROJECT
+          default: 'AGL/{project}'
+          description: "Project to build"
+      - string:
+          name: GERRIT_BRANCH
+          default: master
+          description: "branch to build"
+      - string:
+          name: GERRIT_REFSPEC
+          default: refs/heads/master
+          description: "refspec to build"
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: "8313"
+          description: "change # to build"
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: "2"
+          description: "patchset # to build"
+      - string:
+          name: MACHINE
+          default: 'qemux86-64'
+          description: "Machine to build"
+    build-discarder:
+      days-to-keep: 30
+      artifact-days-to-keep: -1
+      artifact-num-to-keep: 5
+    wrappers:
+      - agl-infra-wrappers:
+          build-timeout: '{build-timeout}'
+      - openstack:
+          single-use: true
+    builders:
+      - shell:
+          !include-raw-escape:
+          - ../common/include-agl-header.sh
+          - ../common/include-agl-repo.sh
+          - ../common/include-agl-select.sh
+          - ../common/include-agl-set-flutter-demo-image.sh
+          - ../common/include-agl-source-aglsetup.sh
+          - ../common/include-agl-auto-conf.sh
+          - ../common/include-agl-remove-wic-auto-conf.sh
+          - ../common/include-agl-limit-parallelism.sh
+          - ../common/include-agl-local-conf-DISTROFEATURES-AGLCI.sh
+          - ../common/include-agl-cat-auto-conf.sh
+          - ../common/include-agl-bitbake-image-nofail.sh
+
+################################################################################
+
+################################################################################
+################################################################################
+# html5-verify-CIB-ic-multicontainer-qemux86-64  = build for iceg multicontainer
+################################################################################
+- job-template:
+    name: 'ci-platform-{project}-verify-CIB-ic-multicontainer-qemux86-64'
+    project-type: freestyle
+    concurrent: true
+    node: agl-test-slave
+    description: "Managed by JJB. Do not Edit. \
+                  <br>Build time graph:<br><img src='buildTimeGraph/png' />"
+    parameters:
+      - string:
+          name: GERRIT_PROJECT
+          default: 'AGL/{project}'
+          description: "Project to build"
+      - string:
+          name: GERRIT_BRANCH
+          default: master
+          description: "branch to build"
+      - string:
+          name: GERRIT_REFSPEC
+          default: refs/heads/master
+          description: "refspec to build"
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: "8313"
+          description: "change # to build"
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: "2"
+          description: "patchset # to build"
+      - string:
+          name: MACHINE
+          default: 'qemux86-64'
+          description: "Machine to build"
+    build-discarder:
+      days-to-keep: 30
+      artifact-days-to-keep: -1
+      artifact-num-to-keep: 5
+    wrappers:
+      - agl-infra-wrappers:
+          build-timeout: '{build-timeout}'
+      - openstack:
+          single-use: true
+    builders:
+      - shell:
+          !include-raw-escape:
+          - ../common/include-agl-header.sh
+          - ../common/include-agl-repo.sh
+          - ../common/include-agl-select.sh
+          - ../common/include-agl-set-iceg-lxc-image.sh
+          - ../common/include-agl-source-aglsetup.sh
+          - ../common/include-agl-auto-conf.sh
+          - ../common/include-agl-remove-wic-auto-conf.sh
+          - ../common/include-agl-limit-parallelism.sh
+          - ../common/include-agl-local-conf-DISTROFEATURES-AGLCI.sh
+          - ../common/include-agl-cat-auto-conf.sh
+          - ../common/include-agl-bitbake-image-nofail.sh
 
 
 ################################################################################
diff --git a/jjb/common/include-agl-header.sh b/jjb/common/include-agl-header.sh
index 6bc70e6f..2380492e 100644
--- 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 test x"needlefish" = x"${TARGETBRANCH}" ; then
+if test x"master" = 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}\""
diff --git a/jjb/common/include-agl-set-flutter-demo-image.sh b/jjb/common/include-agl-set-flutter-demo-image.sh
new file mode 100644
index 00000000..4b82a502
--- /dev/null
+++ b/jjb/common/include-agl-set-flutter-demo-image.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de
+# License GPLv2
+#
+# debugging purposes
+set -e
+
+################################################################################
+## Header
+################################################################################
+
+# only run on master, jellyfish and icefish
+( echo "marlin" | grep -q $TARGETBRANCH ) || exit 0
+
+export TARGETFEATURES="agl-demo agl-devel"
+export TARGETQA=""
+export TARGETIMAGE="agl-ivi-demo-platform-flutter"
+
+eval TARGETIMAGE="$TARGETIMAGE"
+eval TARGETIMAGEnogfx="$TARGETIMAGE"
+
+#if $DEBUG; then
+set | grep ^TARGET || true
+set | grep ^GERRIT || true
+set | grep ^MACHINE || true
+#fi
diff --git a/jjb/common/include-agl-set-iceg-lxc-image.sh b/jjb/common/include-agl-set-iceg-lxc-image.sh
index 1e50cbc7..b16d2be5 100644
--- a/jjb/common/include-agl-set-iceg-lxc-image.sh
+++ b/jjb/common/include-agl-set-iceg-lxc-image.sh
@@ -12,9 +12,9 @@ set -e
 # only run on master, jellyfish and icefish
 ( echo "marlin jellyfish icefish koi lamprey" | grep -q $TARGETBRANCH ) || exit 0
 
-export TARGETFEATURES="agl-iceg agl-devel"
+export TARGETFEATURES="agl-ic-container agl-devel"
 export TARGETQA=""
-export TARGETIMAGE="lxc-host-image-demo"
+export TARGETIMAGE="agl-cluster-demo-lxc-host"
 
 eval TARGETIMAGE="$TARGETIMAGE"
 eval TARGETIMAGEnogfx="$TARGETIMAGE"