Merge "Fix node"

diff --git a/jjb/dmm/dmm.yaml b/jjb/dmm/dmm.yaml
index 20916db..e89d7c7 100644 (file)
--- a/jjb/dmm/dmm.yaml
+++ b/jjb/dmm/dmm.yaml
@@ -36,7 +36,7 @@
     name: 'dmm-verify-{stream}-checkstyle'
 
     project-type: freestyle
-    node: ubuntu1604-builder-8c-8g
+    node: '{os}-builder-8c-8g'
     concurrent: true
 
     build-discarder:
@@ -80,7 +80,7 @@
     name: 'dmm-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: ubuntu1604-builder-8c-8g
+    node: '{os}-builder-8c-8g'
     concurrent: true
 
     build-discarder:
@@ -124,7 +124,7 @@
     name: 'dmm-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: ubuntu1604-builder-8c-8g
+    node: '{os}-builder-8c-8g'
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
       numToKeep: '{build-num-to-keep}'
@@ -166,7 +166,7 @@
     name: 'dmm-csit-verify-func-master-{os}-virl'
 
     project-type: freestyle
-    node: ubuntu1604-builder-8c-8g
+    node: '{os}-builder-8c-8g'
     concurrent: true
 
     build-discarder:

diff --git a/jjb/trex/trex.yaml b/jjb/trex/trex.yaml
index 1c19c31..6e4f62b 100644 (file)
--- a/jjb/trex/trex.yaml
+++ b/jjb/trex/trex.yaml
@@ -19,7 +19,7 @@
     name: 'trex-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -63,7 +63,7 @@
     name: 'trex-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder: