Enhance messaging towards gerrit

especially manually set verified so we can raise the bar step-by-step.

Change-Id: I6410fd72f4a49a64945903e3919ba4f4b39d797a
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
index 64a7c66..688a329 100644 (file)
--- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml
+++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
@@ -60,12 +60,28 @@
       - gerrit-trigger-patch-submitted:
             name: 'AGL/{project}'
             branch: '**/**/**'
+            gerrit-build-started-verified-value: 0
+            gerrit-build-successful-verified-value: 1
+            gerrit-build-failed-verified-value: 0
+            skip-vote:
+                successful: true
+                failed: true
+                unstable: true
+                notbuilt: true
 
     wrappers:
       - agl-infra-wrappers:
           build-timeout: '{build-timeout}'
 
     builders:
+      - 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}
           condition: SUCCESSFUL
@@ -98,9 +114,17 @@
               current-parameters: true
               abort-all-job: true
               kill-phase-on: FAILURE
+      - multijob:
+          name: 'CIBT-{project}-start'
+          condition: SUCCESSFUL
+          projects:
+            - name: 'ci-platform-{project}-verify-CIBT-start'
+              current-parameters: true
+              abort-all-job: true
+              kill-phase-on: FAILURE
       - multijob:
           name: CIBT-{project}
-          condition: COMPLETED
+          condition: SUCCESSFUL
           projects:
             - name: 'ci-platform-{project}-verify-CIBT-porter-nogfx'
               current-parameters: true
@@ -195,6 +219,51 @@
                 - ../common/include-agl-run-test-prepare.sh
                 - ../common/include-agl-run-test-rsync-changeid.sh
 
+#
+# CIB-start
+############
+
+- job-template:
+    name: 'ci-platform-{project}-verify-CIB-start'
+    project-type: freestyle
+    concurrent: true
+    node: control-slave
+
+    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"
+
+    build-discarder:
+      days-to-keep: 30
+      artifact-days-to-keep: -1
+      artifact-num-to-keep: 5
+
+    wrappers:
+      - agl-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    builders:
+      - shell: "set"
+      - shell: "ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --label ci-image-build=0 -n NONE --message='CI-Image-Build started' || true"
+
 #
 # CIB-finish
 ############
@@ -238,8 +307,8 @@
 
     builders:
       - shell: "echo YAY ; set"
-      - shell: "ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --label ci-image-build=+1 -n NONE --message='CI-Image-Build ' || true"
-#; ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${GERRIT_CHANGE_NUMBER},${GERRIT_PATCHSET_NUMBER} --label=ci-image-build=+1 -n NONE --message='CI-Image-Build '"
+      - shell: "ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --label ci-image-build=+1 -n NONE --message='CI-Image-Build finished' || true"
+      - shell: "ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --label Verified=+1 -n NONE --message='Label: Verified' || true"
 
 
 #
@@ -304,6 +373,52 @@
                 - ../common/include-agl-run-test-short.sh
 
 
+#
+# CIBT-start
+################
+
+- job-template:
+    name: 'ci-platform-{project}-verify-CIBT-start'
+    project-type: freestyle
+    concurrent: true
+    node: control-slave
+
+    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"
+
+    build-discarder:
+      days-to-keep: 30
+      artifact-days-to-keep: -1
+      artifact-num-to-keep: 5
+
+    wrappers:
+      - agl-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    builders:
+      - shell: "set "
+      - shell: "ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --label ci-image-boot-test=0 -n NONE --message='CI-Image-Boot-Test started' || true"
+
+
 #
 # CIBT-finish
 ################
@@ -347,5 +462,4 @@
 
     builders:
       - shell: "echo YAY ; set "
-      - shell: "ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --label ci-image-boot-test=+1 -n NONE --message='CI-Image-Boot-Test ' || true"
-#; ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${GERRIT_CHANGE_NUMBER},${GERRIT_PATCHSET_NUMBER} --label=ci-image-build=+1 -n NONE --message='CI-Image-Build '"
+      - shell: "ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --label ci-image-boot-test=+1 -n NONE --message='CI-Image-Boot-Test finished' || true"