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 32ce59f..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'
 
@@ -309,7 +311,7 @@
     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}'
@@ -394,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:
@@ -447,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:
@@ -461,8 +463,6 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - os-parameter:
-          os: 'ubuntu1604'
       - maven-exec:
           maven-version: 'mvn33-new'
 
@@ -526,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:
@@ -540,8 +540,6 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - os-parameter:
-          os: 'ubuntu1604'
       - maven-exec:
           maven-version: 'mvn33-new'
 
@@ -589,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}'
@@ -680,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:
@@ -733,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:
@@ -747,8 +745,6 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - os-parameter:
-          os: 'ubuntu1604'
       - maven-exec:
           maven-version: 'mvn33-new'
 
@@ -812,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:
@@ -826,8 +822,6 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - os-parameter:
-          os: 'ubuntu1604'
       - maven-exec:
           maven-version: 'mvn33-new'
 
@@ -876,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}'
@@ -964,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:
@@ -1017,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}'
@@ -1105,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:
@@ -1159,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}'
@@ -1247,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:
@@ -1300,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}'
@@ -1388,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:
@@ -1441,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}'
@@ -1529,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:
@@ -1582,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}'
@@ -1670,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:
@@ -1723,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}'
@@ -1808,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:
@@ -1861,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}'
@@ -1951,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:
@@ -2006,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}'
@@ -2094,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:
@@ -2151,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}'
@@ -2211,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:
@@ -2266,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}'
@@ -2351,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: