Merge "Sweetcomb - run test only for ubuntu 1604"

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

diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml
index ecffdfb..2cff11d 100644 (file)
--- a/jjb/cicn/cicn.yaml
+++ b/jjb/cicn/cicn.yaml
@@ -227,6 +227,8 @@
 
     project: 'cicn'
     os:
+      - ubuntu1804:
+          repo-os-part: 'ubuntu.bionic.main'
       - ubuntu1604:
           repo-os-part: 'ubuntu.xenial.main'
 
@@ -299,11 +301,17 @@
       - short
       - long
 
+- project:
+    name: cicn-view
+    views:
+      - project-view
+    project-name: cicn
+
 - job-template:
     name: 'cicn-longbow-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -324,6 +332,8 @@
           maven-version: 'mvn33-new'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
+      - stream-parameter:
+          stream: 'release'
 
     scm:
       - gerrit-trigger-scm:
@@ -386,7 +396,7 @@
     name: 'cicn-longbow-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -439,7 +449,7 @@
     name: 'cicn-longbow-docs-merge-{stream}'
 
     project-type: freestyle
-    node: ubuntu1604-basebuild-8c-32g
+    node: 'ubuntu1604-builder-8c-32g'
     concurrent: true
 
     build-discarder:
@@ -453,8 +463,6 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - os-parameter:
-          os: 'ubuntu1604'
       - maven-exec:
           maven-version: 'mvn33-new'
 
@@ -518,7 +526,7 @@
     name: 'cicn-longbow-docs-verify-{stream}'
 
     project-type: freestyle
-    node: ubuntu1604-basebuild-8c-32g
+    node: 'ubuntu1604-builder-8c-32g'
     concurrent: true
 
     build-discarder:
@@ -532,8 +540,6 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - os-parameter:
-          os: 'ubuntu1604'
       - maven-exec:
           maven-version: 'mvn33-new'
 
@@ -581,7 +587,7 @@
     name: 'cicn-libparc-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -602,6 +608,8 @@
           maven-version: 'mvn33-new'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
+      - stream-parameter:
+          stream: 'release'
 
     scm:
       - gerrit-trigger-scm:
@@ -625,6 +633,14 @@
           result: 'failure'
 
     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'
@@ -642,6 +658,9 @@
           !include-raw-escape:
           - ../scripts/maven_push_functions.sh
           - include-raw-cicn-maven-push.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/packagecloud_push.sh
 
     publishers:
       - archive:
@@ -659,7 +678,7 @@
     name: 'cicn-libparc-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -712,7 +731,7 @@
     name: 'cicn-libparc-docs-merge-{stream}'
 
     project-type: freestyle
-    node: ubuntu1604-basebuild-8c-32g
+    node: 'ubuntu1604-builder-8c-32g'
     concurrent: true
 
     build-discarder:
@@ -726,8 +745,6 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - os-parameter:
-          os: 'ubuntu1604'
       - maven-exec:
           maven-version: 'mvn33-new'
 
@@ -791,7 +808,7 @@
     name: 'cicn-libparc-docs-verify-{stream}'
 
     project-type: freestyle
-    node: ubuntu1604-basebuild-8c-32g
+    node: 'ubuntu1604-builder-8c-32g'
     concurrent: true
 
     build-discarder:
@@ -805,8 +822,6 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - os-parameter:
-          os: 'ubuntu1604'
       - maven-exec:
           maven-version: 'mvn33-new'
 
@@ -855,7 +870,7 @@
     name: 'cicn-libccnx-common-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -876,6 +891,8 @@
           maven-version: 'mvn33-new'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
+      - stream-parameter:
+          stream: 'master'
 
     scm:
       - gerrit-trigger-scm:
@@ -896,6 +913,14 @@
           result: 'failure'
 
     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'
@@ -913,6 +938,9 @@
           !include-raw-escape:
           - ../scripts/maven_push_functions.sh
           - include-raw-cicn-maven-push.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/packagecloud_push.sh
 
     publishers:
       - archive:
@@ -930,7 +958,7 @@
     name: 'cicn-libccnx-common-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -983,7 +1011,7 @@
     name: 'cicn-libccnx-transport-rta-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1004,6 +1032,8 @@
           maven-version: 'mvn33-new'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
+      - stream-parameter:
+          stream: 'master'
 
     scm:
       - gerrit-trigger-scm:
@@ -1024,6 +1054,14 @@
           result: 'failure'
 
     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'
@@ -1041,6 +1079,9 @@
           !include-raw-escape:
           - ../scripts/maven_push_functions.sh
           - include-raw-cicn-maven-push.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/packagecloud_push.sh
 
     publishers:
       - archive:
@@ -1058,7 +1099,7 @@
     name: 'cicn-libccnx-transport-rta-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -1112,7 +1153,7 @@
     name: 'cicn-libccnx-portal-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1133,6 +1174,8 @@
           maven-version: 'mvn33-new'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
+      - stream-parameter:
+          stream: 'master'
 
     scm:
       - gerrit-trigger-scm:
@@ -1153,6 +1196,14 @@
           result: 'failure'
 
     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'
@@ -1170,6 +1221,9 @@
           !include-raw-escape:
           - ../scripts/maven_push_functions.sh
           - include-raw-cicn-maven-push.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/packagecloud_push.sh
 
     publishers:
       - archive:
@@ -1187,7 +1241,7 @@
     name: 'cicn-libccnx-portal-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -1240,7 +1294,7 @@
     name: 'cicn-libicnet-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1261,6 +1315,8 @@
           maven-version: 'mvn33-new'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
+      - stream-parameter:
+          stream: 'master'
 
     scm:
       - gerrit-trigger-scm:
@@ -1281,6 +1337,14 @@
           result: 'failure'
 
     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'
@@ -1298,6 +1362,9 @@
           !include-raw-escape:
           - ../scripts/maven_push_functions.sh
           - include-raw-cicn-maven-push.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/packagecloud_push.sh
 
     publishers:
       - archive:
@@ -1315,7 +1382,7 @@
     name: 'cicn-libicnet-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -1368,7 +1435,7 @@
     name: 'cicn-metis-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1389,6 +1456,8 @@
           maven-version: 'mvn33-new'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
+      - stream-parameter:
+          stream: 'master'
 
     scm:
       - gerrit-trigger-scm:
@@ -1409,6 +1478,14 @@
           result: 'failure'
 
     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'
@@ -1426,6 +1503,9 @@
           !include-raw-escape:
           - ../scripts/maven_push_functions.sh
           - include-raw-cicn-maven-push.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/packagecloud_push.sh
 
     publishers:
       - archive:
@@ -1443,7 +1523,7 @@
     name: 'cicn-metis-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -1496,7 +1576,7 @@
     name: 'cicn-http-server-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1517,6 +1597,8 @@
           maven-version: 'mvn33-new'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
+      - stream-parameter:
+          stream: 'master'
 
     scm:
       - gerrit-trigger-scm:
@@ -1537,6 +1619,14 @@
           result: 'failure'
 
     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'
@@ -1554,6 +1644,9 @@
           !include-raw-escape:
           - ../scripts/maven_push_functions.sh
           - include-raw-cicn-maven-push.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/packagecloud_push.sh
 
     publishers:
       - archive:
@@ -1571,7 +1664,7 @@
     name: 'cicn-http-server-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -1624,7 +1717,7 @@
     name: 'cicn-vpp-plugin-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1645,6 +1738,8 @@
           maven-version: 'mvn33-new'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
+      - stream-parameter:
+          stream: 'master'
 
     scm:
       - gerrit-trigger-scm:
@@ -1662,6 +1757,14 @@
           branch: '{branch}'
 
     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'
@@ -1679,6 +1782,9 @@
           !include-raw-escape:
           - ../scripts/maven_push_functions.sh
           - include-raw-cicn-maven-push.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/packagecloud_push.sh
 
     publishers:
       - archive:
@@ -1696,7 +1802,7 @@
     name: 'cicn-vpp-plugin-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -1749,7 +1855,7 @@
     name: 'cicn-viper-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1770,6 +1876,8 @@
           maven-version: 'mvn33-new'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
+      - stream-parameter:
+          stream: 'master'
 
     scm:
       - gerrit-trigger-scm:
@@ -1790,6 +1898,14 @@
           result: 'failure'
 
     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'
@@ -1807,6 +1923,9 @@
           !include-raw-escape:
           - ../scripts/maven_push_functions.sh
           - include-raw-cicn-maven-push.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/packagecloud_push.sh
 
     publishers:
       - archive:
@@ -1826,7 +1945,7 @@
     name: 'cicn-viper-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -1881,7 +2000,7 @@
     name: 'cicn-radio-emulators-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1902,6 +2021,8 @@
           maven-version: 'mvn33-new'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
+      - stream-parameter:
+          stream: 'master'
 
     scm:
       - gerrit-trigger-scm:
@@ -1919,6 +2040,14 @@
           branch: '{branch}'
 
     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'
@@ -1936,6 +2065,9 @@
           !include-raw-escape:
           - ../scripts/maven_push_functions.sh
           - include-raw-cicn-maven-push.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/packagecloud_push.sh
 
     publishers:
       - archive:
@@ -1956,7 +2088,7 @@
     name: 'cicn-radio-emulators-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -2013,7 +2145,7 @@
     name: 'cicn-android-sdk-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -2073,7 +2205,7 @@
     name: 'cicn-android-sdk-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -2128,7 +2260,7 @@
     name: 'cicn-vicn-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -2149,6 +2281,8 @@
           maven-version: 'mvn33-new'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
+      - stream-parameter:
+          stream: 'master'
 
     scm:
       - gerrit-trigger-scm:
@@ -2166,6 +2300,14 @@
           branch: '{branch}'
 
     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'
@@ -2183,6 +2325,9 @@
           !include-raw-escape:
           - ../scripts/maven_push_functions.sh
           - include-raw-cicn-maven-push.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/packagecloud_push.sh
 
     publishers:
       - archive:
@@ -2200,7 +2345,7 @@
     name: 'cicn-vicn-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder: