X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcicn%2Fcicn.yaml;h=62433580140f9c14b8f2e152fd16fe183da2cf11;hb=9232f92ae6c6d70d403c84a71ea1ab730358161e;hp=77b762830c4437baad4d1bfdefeb54b441fd403a;hpb=446296d521adbf96ef3d39ab100d2e0507ccd7a2;p=ci-management.git

diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml
index 77b762830..624335801 100644
--- a/jjb/cicn/cicn.yaml
+++ b/jjb/cicn/cicn.yaml
@@ -5,8 +5,6 @@
         - 'cicn-longbow-merge-{stream}-{os}'
     project: 'cicn'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
         - centos7:
@@ -26,8 +24,6 @@
         - 'cicn-libparc-merge-{stream}-{os}'
     project: 'cicn'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
         - centos7:
@@ -47,8 +43,6 @@
         - 'cicn-libccnx-common-merge-{stream}-{os}'
     project: 'cicn'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
         - centos7:
@@ -68,8 +62,6 @@
         - 'cicn-libccnx-transport-rta-merge-{stream}-{os}'
     project: 'cicn'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
         - centos7:
@@ -89,8 +81,6 @@
         - 'cicn-libccnx-portal-merge-{stream}-{os}'
     project: 'cicn'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
         - centos7:
@@ -110,8 +100,6 @@
         - 'cicn-libicnet-merge-{stream}-{os}'
     project: 'cicn'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
         - centos7:
@@ -131,8 +119,6 @@
         - 'cicn-metis-merge-{stream}-{os}'
     project: 'cicn'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
         - centos7:
@@ -152,8 +138,6 @@
         - 'cicn-http-server-merge-{stream}-{os}'
     project: 'cicn'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
         - centos7:
@@ -173,8 +157,6 @@
         - 'cicn-vpp-plugin-merge-{stream}-{os}'
     project: 'cicn'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
         - centos7:
@@ -1555,6 +1537,12 @@
             branch: '{branch}'
         - os-parameter:
             os: '{os}'
+        - maven-project-parameter:
+            maven: 'mvn33-new'
+        - maven-exec:
+            maven-version: 'mvn33-new'
+        - repo-name-parameter:
+            repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
         - gerrit-trigger-scm:
@@ -1650,6 +1638,12 @@
             branch: '{branch}'
         - os-parameter:
             os: '{os}'
+        - maven-project-parameter:
+            maven: 'mvn33-new'
+        - maven-exec:
+            maven-version: 'mvn33-new'
+        - repo-name-parameter:
+            repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
         - gerrit-trigger-scm:
@@ -1668,12 +1662,26 @@
         - timed: '@daily'
 
     builders:
+        - maven-target:
+            maven-version: 'mvn33-new'
+            goals: '--version'
+            settings: 'cicn-settings'
+            settings-type: cfp
+            global-settings: 'global-settings'
+            global-settings-type: cfp
         - shell:
             !include-raw-escape:
                 - include-raw-cicn-vicn-build.sh
+        - provide-maven-settings:
+            settings-file: 'cicn-settings'
+            global-settings-file: 'global-settings'
+        - shell:
+            !include-raw-escape:
+                - ../scripts/maven_push_functions.sh
+                - include-raw-cicn-maven-push.sh
     publishers:
         - archive:
-            artifacts: 'build/*.deb,build/*.rpm'
+            artifacts: 'build/*.rpm,build/*.deb'
             allow-empty: 'true'
             fingerprint: false
             only-if-success: true