From fcd1ea2c2baff977470da8ca53db560c8df21073 Mon Sep 17 00:00:00 2001
From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Thu, 5 Mar 2020 18:02:20 +0100
Subject: Add build variant for agl-compositor image in CI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Build the agl-compositor feature for qemux86-64.

Change-Id: I83b79a390d3981b98b24aa53a56aacf9a3f177e5
Bug-AGL: SPEC-3253
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---
 jjb/ci-AGL-verify/ci-platform-jjb.yaml         | 75 +++++++++++++++++++++++++-
 jjb/common/include-agl-set-compositor-image.sh | 27 ++++++++++
 2 files changed, 100 insertions(+), 2 deletions(-)
 create mode 100644 jjb/common/include-agl-set-compositor-image.sh

diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
index a607945d..2320d57e 100644
--- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml
+++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
@@ -24,6 +24,7 @@
       # - ci-platform-{project}-verify-CIB-start             #unused
       - ci-platform-{project}-verify-CIB-{machine}
       - ci-platform-html5-{project}-verify-CIB-qemux86-64
+      - ci-platform-aglcompositor-{project}-verify-CIB-qemux86-64
       - ci-platform-{project}-verify-CIB-finish-success
       - ci-platform-{project}-verify-failure
       # - ci-platform-{project}-verify-CIBT-start            #unused
@@ -105,8 +106,12 @@
               kill-phase-on: FAILURE
             - name: 'ci-platform-html5-{project}-verify-CIB-qemux86-64'
               current-parameters: true
-              abort-all-job: true
-              kill-phase-on: FAILURE
+              abort-all-job: false
+              kill-phase-on: NEVER
+            - name: 'ci-platform-aglcompositor-{project}-verify-CIB-qemux86-64'
+              current-parameters: true
+              abort-all-job: false
+              kill-phase-on: NEVER
       - multijob:
           name: CIB-{project}-devboards
           condition: SUCCESSFUL
@@ -420,6 +425,72 @@
                 !include-raw-escape:
                 - ../common/include-agl-get-cost.sh
 
+################################################################################
+################################################################################
+# html5-verify-CIB-{machine}  = build for machine
+################################################################################
+- job-template:
+    name: 'ci-platform-aglcompositor-{project}-verify-CIB-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-compositor-image.sh
+          - ../common/include-agl-source-aglsetup.sh
+          - ../common/include-agl-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.sh
+      - conditional-step:
+          condition-kind: always
+          steps:
+            - shell:
+                !include-raw-escape:
+                - ../common/include-agl-get-cost.sh
+
+
 
 ################################################################################
 ################################################################################
diff --git a/jjb/common/include-agl-set-compositor-image.sh b/jjb/common/include-agl-set-compositor-image.sh
new file mode 100644
index 00000000..3bb577a1
--- /dev/null
+++ b/jjb/common/include-agl-set-compositor-image.sh
@@ -0,0 +1,27 @@
+#!/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 "master jellyfish icefish" | grep -q $TARGETBRANCH ) || exit 0
+
+# Use the agl-compositor
+export TARGETFEATURES="agl-demo agl-devel agl-netboot agl-compositor"
+export TARGETQA=""
+export TARGETIMAGE="agl-demo-platform"
+
+eval TARGETIMAGE="$TARGETIMAGE"
+eval TARGETIMAGEnogfx="$TARGETIMAGE"
+
+#if $DEBUG; then
+set | grep ^TARGET || true
+set | grep ^GERRIT || true
+set | grep ^MACHINE || true
+#fi
-- 
cgit 1.2.3-korg