Merge "Modify puppet-fdio node"

diff --git a/jjb/dmm/dmm.yaml b/jjb/dmm/dmm.yaml
index 93f4bea..b8cef65 100644 (file)
--- a/jjb/dmm/dmm.yaml
+++ b/jjb/dmm/dmm.yaml
@@ -42,7 +42,7 @@
     name: 'dmm-verify-{stream}-checkstyle'
 
     project-type: freestyle
-    node: '{os}-builder-8c-8g'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -86,7 +86,7 @@
     name: 'dmm-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-builder-8c-8g'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -130,7 +130,7 @@
     name: 'dmm-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-builder-8c-8g'
+    node: '{os}-basebuild-4c-4g'
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
       numToKeep: '{build-num-to-keep}'
@@ -172,7 +172,7 @@
     name: 'dmm-csit-verify-func-master-{os}-virl'
 
     project-type: freestyle
-    node: '{os}-builder-8c-8g'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     build-discarder:

diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml
index 6a40293..24377cc 100644 (file)
--- a/jjb/hicn/hicn.yaml
+++ b/jjb/hicn/hicn.yaml
@@ -255,6 +255,10 @@
       - shell:
           !include-raw-escape:
           - ../scripts/packagecloud_push.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/maven_push_functions.sh
+          - include-raw-hicn-maven-push.sh
 
     publishers:
       - archive:
@@ -279,6 +283,6 @@
     mvn-settings: hicn
     mvn-version: 'mvn33-new'
     branch: master
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-basebuild-4c-4g
     jobs:
       - gerrit-maven-sonar

diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml
index 7cdbe1c..2426bb9 100644 (file)
--- a/jjb/tldk/tldk.yaml
+++ b/jjb/tldk/tldk.yaml
@@ -37,7 +37,7 @@
     name: '{project}-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-builder-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -85,7 +85,7 @@
     name: '{project}-verify-image-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-builder-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -146,7 +146,7 @@
     name: '{project}-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-builder-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
       numToKeep: '{build-num-to-keep}'
@@ -192,7 +192,7 @@
     name: 'tldk-csit-verify-func-{stream}-{os}-virl'
 
     project-type: freestyle
-    node: '{os}-builder-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     build-discarder: