X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fhoneycomb%2Fhoneycomb.yaml;h=bb02015026ac1b290f00056e3af5c46a1339d0a9;hb=913ba01caa6b5f9f6adc1a3bd5e8db96740ad445;hp=965c6fedf5af674dca92c166927d160ae2fa25aa;hpb=dffe5f70993a06bf64eab89ca485648a93f16b59;p=ci-management.git

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 965c6fedf..bb0201502 100644
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -1,18 +1,28 @@
 - project:
     name: honeycomb
     jobs:
-        - 'honeycomb-verify-{branch}-{os}'
-        - 'honeycomb-merge-{branch}-{os}'
-        - 'honeycomb-integration-{branch}-{os}'
-        - 'honeycomb-verify-image-{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'
+        - centos7:
+            repo-os-part: 'centos7'
+    stream:
+        - master:
+            branch: 'master'
+            repo-stream-part: 'master'
+        - '1609':
+            branch: 'stable/1609'
+            repo-stream-part: 'stable.1609'
 
 - job-template:
-    name: 'honeycomb-verify-{branch}-{os}'
+    name: 'honeycomb-verify-{stream}-{os}'
     project-type: maven
-    node: verify
+    node: verify-{os}
     concurrent: true
 
     logrotate:
@@ -36,10 +46,11 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - build-timeout
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -48,12 +59,12 @@
 
     prebuilders:
         - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /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||echo 'ignoring failure';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'
+        maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
         settings: 'honeycomb-settings'
         settings-type: cfp
         global-settings: 'global-settings'
@@ -61,14 +72,14 @@
 
     postbuilders:
         - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /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||echo 'ignoring failure';fi
 
     publishers:
         - email-notification:
             email-prefix: '[honeycomb]'
 
 - job-template:
-    name: 'honeycomb-verify-image-{branch}-{os}'
+    name: 'honeycomb-verify-image-{stream}-{os}'
     project-type: maven
     node: 'verify-image-{os}'
     concurrent: true
@@ -94,10 +105,11 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - build-timeout
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
@@ -119,12 +131,12 @@
 
     prebuilders:
         - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /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||echo 'ignoring failure';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'
+        maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
         settings: 'honeycomb-settings'
         settings-type: cfp
         global-settings: 'global-settings'
@@ -132,17 +144,16 @@
 
     postbuilders:
         - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /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||echo 'ignoring failure';fi
 
     publishers:
         - email-notification:
             email-prefix: '[honeycomb]'
 
 - job-template:
-    name: 'honeycomb-merge-{branch}-{os}'
+    name: 'honeycomb-merge-{stream}-{os}'
     project-type: maven
-    node: merge
-    jdk: '{jdk}'
+    node: merge-{os}
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -155,6 +166,10 @@
             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:
@@ -163,10 +178,11 @@
             choosing-strategy: 'default'
 
     wrappers:
-        - build-timeout
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-patch-merged:
@@ -175,13 +191,13 @@
 
     prebuilders:
         - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /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||echo 'ignoring failure';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'
+        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 -Dmaven.compile.fork=true'
         settings: 'honeycomb-settings'
         settings-type: cfp
         global-settings: 'global-settings'
@@ -189,24 +205,22 @@
 
     postbuilders:
         - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /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||echo 'ignoring failure';fi
 
     reporters:
         - findbugs
 
     publishers:
+        - sonar:
+            language: 'java'
+            branch: '{stream}'
         - email-notification:
             email-prefix: '[honeycomb]'
-        - maven-deploy:
-            id: ''
-            unique-version: true
-            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}'
@@ -219,6 +233,10 @@
             project: '{project}'
         - os-parameter:
             os: '{os}'
+        - maven-project-parameter:
+            maven: '{mvn33}'
+        - repo-name-parameter:
+            repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
         - git-scm:
@@ -227,33 +245,48 @@
             branch: '{branch}'
 
     wrappers:
-        - build-timeout
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - reverse:
-            jobs: 'vpp-merge'
+            jobs: 'vpp-merge-{stream}-{os},honeycomb-merge-{stream}-{os}'
             result: 'success'
 
     prebuilders:
         - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /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||echo 'ignoring failure';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'
+        maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
         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 -s /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||echo 'ignoring failure';fi
 
     reporters:
         - findbugs