X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcicn%2Fcicn.yaml;h=b941791f4f4c488523752a4b7c515718e4834221;hb=29be786d3165364f61fadadf0fba430c2f377018;hp=a5e0243fb33e19f64aa10f47e71e1072acef8355;hpb=214cb2ffa873d73c5a7c4922849a22ae2a1f37d9;p=ci-management.git

diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml
index a5e0243fb..b941791f4 100644
--- a/jjb/cicn/cicn.yaml
+++ b/jjb/cicn/cicn.yaml
@@ -269,7 +269,7 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -306,6 +306,14 @@
         - timed: '@daily'
 
     builders:
+        - config-file-provider:
+            files:
+              - file-id: '.packagecloud'
+                target: '/home/jenkins/.packagecloud'
+        - config-file-provider:
+            files:
+              - file-id: 'packagecloud_api'
+                target: '/home/jenkins/packagecloud_api'
         - maven-target:
             maven-version: 'mvn33-new'
             goals: '--version'
@@ -323,6 +331,10 @@
             !include-raw-escape:
                 - ../scripts/maven_push_functions.sh
                 - include-raw-cicn-maven-push.sh
+        - shell:
+            !include-raw-escape:
+                - ../scripts/packagecloud_push.sh
+
     publishers:
         - archive:
             artifacts: 'longbow/build/*.rpm,longbow/build/*.deb'
@@ -340,7 +352,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -391,7 +403,7 @@
     node: ubuntu1604-basebuild-8c-32g
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -469,7 +481,7 @@
     node: ubuntu1604-basebuild-8c-32g
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -530,7 +542,7 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -606,7 +618,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -657,7 +669,7 @@
     node: ubuntu1604-basebuild-8c-32g
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -684,6 +696,9 @@
             build-timeout: '{build-timeout}'
 
     triggers:
+        - reverse:
+            jobs: 'cicn-libparc-merge-{stream}-ubuntu1604'
+            result: 'success'
         - gerrit:
             server-name: 'Primary'
             trigger-on:
@@ -732,7 +747,7 @@
     node: ubuntu1604-basebuild-8c-32g
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -794,7 +809,7 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -867,7 +882,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -917,7 +932,7 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -990,7 +1005,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1040,7 +1055,7 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1113,7 +1128,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1163,7 +1178,7 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1236,7 +1251,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1286,7 +1301,7 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1359,7 +1374,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1409,7 +1424,7 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1482,7 +1497,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1532,7 +1547,7 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1603,7 +1618,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1653,7 +1668,7 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1726,7 +1741,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1776,7 +1791,7 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1847,7 +1862,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1897,7 +1912,7 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1939,7 +1954,7 @@
                 - include-raw-cicn-android-sdk-build.sh
     publishers:
         - archive:
-            artifacts: 'iGetAndroid/app/build/outputs/apk/*.apk,MetisForwarder/app/build/outputs/apk/*.apk,build/viper/viper-armv7//build/outputs/apk/*.apk'
+            artifacts: 'IGetAndroid/app/build/outputs/apk/release/*.apk,MetisForwarderAndroid/app/build/outputs/apk/release/*.apk,HttpServer/app/build/outputs/apk/release/*.apk,build_armv7-a/viper/viper-armv7//build/outputs/apk/*.apk'
             allow-empty: 'true'
             fingerprint: false
             only-if-success: true
@@ -1954,7 +1969,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -2004,7 +2019,7 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -2075,7 +2090,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'