Merge "No clean before deploy"

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 8d0a0d4..a47ff00 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -960,6 +960,7 @@
     #                     parameterized.
     name: '{project-name}-{stream}-stage-site-java'
     project-type: freestyle
+    node: '{build-node}'
 
     properties:
       - ecomp-infra-properties:

diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index 83f4fe6..87ddb87 100644 (file)
--- a/jjb/global-templates-script.yaml
+++ b/jjb/global-templates-script.yaml
@@ -872,7 +872,7 @@
 
     project-type: freestyle
     concurrent: true
-    node: 'ubuntu1604-docker-2c-1g'
+    node: 'ubuntu1604-docker-8c-8g'
 
     parameters:
       - string:
@@ -900,4 +900,4 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - docker-login
-      - shell: !include-raw: include-docker-blessing.sh
\ No newline at end of file
+      - shell: !include-raw: include-docker-blessing.sh

diff --git a/jjb/mso/mso.yaml b/jjb/mso/mso.yaml
index 8c2e328..548b79b 100644 (file)
--- a/jjb/mso/mso.yaml
+++ b/jjb/mso/mso.yaml
@@ -14,6 +14,7 @@
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-release-version-java-daily'
+          build-node: 'ubuntu1604-basebuild-8c-8g'
 
     project: 'mso'
     stream: