X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fhoneycomb%2Fhoneycomb.yaml;h=0d83c6fe5fa345772f8e9229e242363d9574c76d;hb=820077ac0c0540f757015c63dbef262c7cd1b3ee;hp=e109734495b58b055a7fcffd1e1bca751e6e22ec;hpb=243d1fbbc7146792575b5ec920c1ad89b810abab;p=ci-management.git

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index e10973449..0d83c6fe5 100644
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -1,17 +1,23 @@
 - project:
     name: honeycomb
     jobs:
-        - 'honeycomb-verify-{branch}-{os}'
-        - 'honeycomb-merge-{branch}-{os}'
-        - 'honeycomb-integration-{branch}-{os}'
+        - 'honeycomb-verify-{stream}-{os}'
+        - 'honeycomb-merge-{stream}-{os}'
+        - 'honeycomb-integration-{stream}-{os}'
+        - 'honeycomb-verify-image-{stream}-{os}'
     project: 'honeycomb'
-    branch: 'master'
-    os: 'ubuntu1404'
+    os:
+        - ubuntu1404:
+            repo-os-part: 'ubuntu.trusty.main'
+    stream:
+        - master:
+            branch: 'master'
+            repo-stream-part: 'master'
 
 - job-template:
-    name: 'honeycomb-verify-{branch}-{os}'
+    name: 'honeycomb-verify-{stream}-{os}'
     project-type: maven
-    node: verify
+    node: verify-{os}
     concurrent: true
 
     logrotate:
@@ -47,28 +53,30 @@
 
     prebuilders:
         - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives /usr/lib/jvm/java-1.8.0-openjdk-amd64;fi
+            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64;fi
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true'
         maven-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-        settings: '{honeycomb-settings}'
-        global-settings: '{global-settings}'
+        settings: 'honeycomb-settings'
+        settings-type: cfp
+        global-settings: 'global-settings'
+        global-settings-type: cfp
 
     postbuilders:
         - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives /usr/lib/jvm/java-1.7.0-openjdk-amd64;fi
+            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64;fi
 
     publishers:
         - email-notification:
             email-prefix: '[honeycomb]'
 
 - job-template:
-    name: 'honeycomb-merge-{branch}-{os}'
+    name: 'honeycomb-verify-image-{stream}-{os}'
     project-type: maven
-    node: merge
-    jdk: '{jdk}'
+    node: 'verify-image-{os}'
+    concurrent: true
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -79,9 +87,83 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
         - os-parameter:
             os: '{os}'
 
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - gerrit:
+            server-name: 'Primary'
+            trigger-on:
+                - comment-added-contains-event:
+                    comment-contains-value: 'verify-images'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '{project}'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+            skip-vote:
+                successful: true
+                failed: true
+                unstable: true
+                notbuilt: true
+
+    prebuilders:
+        - shell: |
+            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64;fi
+    maven:
+        maven-name: '{mvn33}'
+        root-pom: 'pom.xml'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true'
+        maven-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: 'honeycomb-settings'
+        settings-type: cfp
+        global-settings: 'global-settings'
+        global-settings-type: cfp
+
+    postbuilders:
+        - shell: |
+            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64;fi
+
+    publishers:
+        - email-notification:
+            email-prefix: '[honeycomb]'
+
+- job-template:
+    name: 'honeycomb-merge-{stream}-{os}'
+    project-type: maven
+    node: merge-{os}
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - os-parameter:
+            os: '{os}'
+        - maven-project-parameter:
+            maven: '{mvn33}'
+        - repo-name-parameter:
+            repo-name: '{repo-stream-part}.{repo-os-part}'
+
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
@@ -101,24 +183,42 @@
 
     prebuilders:
         - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives /usr/lib/jvm/java-1.8.0-openjdk-amd64;fi
+            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64;fi
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true -Dsonar'
         maven-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-        settings: '{honeycomb-settings}'
-        global-settings: '{global-settings}'
+        settings: 'honeycomb-settings'
+        settings-type: cfp
+        global-settings: 'global-settings'
+        global-settings-type: cfp
 
     postbuilders:
+        - maven-target:
+            maven-version: '{mvn33}'
+            goals: '--version'
+            settings: 'honeycomb-settings'
+            settings-type: cfp
+            global-settings: 'global-settings'
+            global-settings-type: cfp
+        - provide-maven-settings:
+            settings-file: 'honeycomb-settings'
+            global-settings-file: 'global-settings'
+        - shell:
+            !include-raw-escape:
+                - ../scripts/maven_push_functions.sh
+                - include-raw-honeycomb-pkg-push.sh
         - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives /usr/lib/jvm/java-1.7.0-openjdk-amd64;fi
+            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64;fi
 
     reporters:
         - findbugs
 
     publishers:
+        - sonar:
+            language: 'java'
         - email-notification:
             email-prefix: '[honeycomb]'
         - maven-deploy:
@@ -127,10 +227,9 @@
             deploy-unstable: false
 
 - job-template:
-    name: 'honeycomb-integration-{branch}-{os}'
+    name: 'honeycomb-integration-{stream}-{os}'
     project-type: maven
-    node: merge
-    jdk: '{jdk}'
+    node: merge-{os}
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -158,29 +257,47 @@
 
     triggers:
         - reverse:
-            jobs: 'vpp-merge'
+            jobs: 'vpp-merge-{branch}-{os}'
             result: 'success'
 
     prebuilders:
         - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives /usr/lib/jvm/java-1.8.0-openjdk-amd64;fi
+            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64;fi
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true -Dsonar'
         maven-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-        settings: '{honeycomb-settings}'
-        global-settings: '{global-settings}'
+        settings: 'honeycomb-settings'
+        settings-type: cfp
+        global-settings: 'global-settings'
+        global-settings-type: cfp
 
     postbuilders:
+        - maven-target:
+            maven-version: '{mvn33}'
+            goals: '--version'
+            settings: 'honeycomb-settings'
+            settings-type: cfp
+            global-settings: 'global-settings'
+            global-settings-type: cfp
+        - provide-maven-settings:
+            settings-file: 'honeycomb-settings'
+            global-settings-file: 'global-settings'
+        - shell:
+            !include-raw-escape:
+                - ../scripts/maven_push_functions.sh
+                - include-raw-honeycomb-pkg-push.sh
         - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives /usr/lib/jvm/java-1.7.0-openjdk-amd64;fi
+            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64;fi
 
     reporters:
         - findbugs
 
     publishers:
+        - sonar:
+            language: 'java'
         - email-notification:
             email-prefix: '[honeycomb]'
         - maven-deploy: