Further fixes for maven push of rpm for honeycomb

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

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 15b753d..6b1e9be 100644 (file)
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -6,15 +6,20 @@
         - 'honeycomb-integration-{stream}-{os}'
         - 'honeycomb-verify-image-{stream}-{os}'
     project: 'honeycomb'
+    os:
+        - ubuntu1404:
+            repo-os-part: 'ubuntu.trusty.main'
+        - centos7:
+            repo-os-part: 'centos7'
     stream:
         - master:
             branch: 'master'
-    os: 'ubuntu1404'
+            repo-stream-part: 'master'
 
 - job-template:
     name: 'honeycomb-verify-{stream}-{os}'
     project-type: maven
-    node: verify
+    node: verify-{os}
     concurrent: true
 
     logrotate:
@@ -143,8 +148,7 @@
 - job-template:
     name: 'honeycomb-merge-{stream}-{os}'
     project-type: maven
-    node: merge
-    jdk: '{jdk}'
+    node: merge-{os}
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -157,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:
@@ -190,6 +198,20 @@
         global-settings-type: cfp
 
     postbuilders:
+        - maven-target:
+            maven-version: '{mvn33}'
+            goals: '--version'
+            settings: 'vpp-settings'
+            settings-type: cfp
+            global-settings: 'global-settings'
+            global-settings-type: cfp
+        - provide-maven-settings:
+            settings-file: 'vpp-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
 
@@ -209,8 +231,7 @@
 - job-template:
     name: 'honeycomb-integration-{stream}-{os}'
     project-type: maven
-    node: merge
-    jdk: '{jdk}'
+    node: merge-{os}
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -256,6 +277,20 @@
         global-settings-type: cfp
 
     postbuilders:
+        - maven-target:
+            maven-version: '{mvn33}'
+            goals: '--version'
+            settings: 'vpp-settings'
+            settings-type: cfp
+            global-settings: 'global-settings'
+            global-settings-type: cfp
+        - provide-maven-settings:
+            settings-file: 'vpp-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