Merge "Create script to automate deployment"

[ci-management.git] / jjb / honeycomb / honeycomb.yaml

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 6e97e70..624280d 100644 (file)
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -1,18 +1,25 @@
 - 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'
 
 - job-template:
-    name: 'honeycomb-verify-{branch}-{os}'
+    name: 'honeycomb-verify-{stream}-{os}'
     project-type: maven
-    node: verify
+    node: verify-{os}
     concurrent: true
 
     logrotate:
@@ -54,8 +61,10 @@
         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: |
@@ -66,7 +75,7 @@
             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
@@ -123,8 +132,10 @@
         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: |
@@ -135,10 +146,9 @@
             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}'
@@ -151,6 +161,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:
@@ -176,12 +190,18 @@
     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:
+        - 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
 
@@ -189,6 +209,8 @@
         - findbugs
 
     publishers:
+        - sonar:
+            language: 'java'
         - email-notification:
             email-prefix: '[honeycomb]'
         - maven-deploy:
@@ -197,10 +219,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}'
@@ -238,10 +259,12 @@
     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:
         - shell: |
@@ -251,6 +274,8 @@
         - findbugs
 
     publishers:
+        - sonar:
+            language: 'java'
         - email-notification:
             email-prefix: '[honeycomb]'
         - maven-deploy: