Fix indentation and add buildnode.

Issue-Id: DCAEGEN2-60
Change-Id: I989394fe2813513d4f3b3c1504600e7a313abddf
Signed-off-by: Lusheng Ji <lji@research.att.com>

diff --git a/jjb/dcaegen2/dcaegen2-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics.yaml
index 64d98f1..eadcdbe 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-analytics.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics.yaml
@@ -11,11 +11,12 @@
     stream:
       - 'master':
           branch: 'master'
-          mvn-settings: 'dcaegen2-analytics-settings'
-          # due to a strange macro / variable translation problem this needs
-          # to be passed as a string block to properly get the properties
-          # correctly defined in the job
-          maven-deploy-properties: |
-            deployAtEnd=true
-          files: '**'
-          archive-artifacts: ''
+    mvn-settings: 'dcaegen2-analytics-settings'
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'

diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index 371b5e0..2f0e887 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -11,11 +11,12 @@
     stream:
       - 'master':
           branch: 'master'
-          mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
-          # due to a strange macro / variable translation problem this needs
-          # to be passed as a string block to properly get the properties
-          # correctly defined in the job
-          maven-deploy-properties: |
-            deployAtEnd=true
-          files: '**'
-          archive-artifacts: ''
+    mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'

diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index 74d9a24..f310f5b 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -11,11 +11,12 @@
     stream:
       - 'master':
           branch: 'master'
-          mvn-settings: 'dcaegen2-collectors-ves-settings'
-          # due to a strange macro / variable translation problem this needs
-          # to be passed as a string block to properly get the properties
-          # correctly defined in the job
-          maven-deploy-properties: |
-            deployAtEnd=true
-          files: '**'
-          archive-artifacts: ''
+    mvn-settings: 'dcaegen2-collectors-ves-settings'
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'

diff --git a/jjb/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml
index cc9fb1f..2dbee3a 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors.yaml
@@ -11,11 +11,12 @@
     stream:
       - 'master':
           branch: 'master'
-          mvn-settings: 'dcaegen2-collectors-settings'
-          # due to a strange macro / variable translation problem this needs
-          # to be passed as a string block to properly get the properties
-          # correctly defined in the job
-          maven-deploy-properties: |
-            deployAtEnd=true
-          files: '**'
-          archive-artifacts: ''
+    mvn-settings: 'dcaegen2-collectors-settings'
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'

diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index 1291c4d..8e48258 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -11,11 +11,12 @@
     stream:
       - 'master':
           branch: 'master'
-          mvn-settings: 'dcaegen2-deployments-settings'
-          # due to a strange macro / variable translation problem this needs
-          # to be passed as a string block to properly get the properties
-          # correctly defined in the job
-          maven-deploy-properties: |
-            deployAtEnd=true
-          files: '**'
-          archive-artifacts: ''
+    mvn-settings: 'dcaegen2-deployments-settings'
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'

diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
index 6160930..0d4ff25 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
@@ -11,11 +11,12 @@
     stream:
       - 'master':
           branch: 'master'
-          mvn-settings: 'dcaegen2-platform-blueprints-settings'
-          # due to a strange macro / variable translation problem this needs
-          # to be passed as a string block to properly get the properties
-          # correctly defined in the job
-          maven-deploy-properties: |
-            deployAtEnd=true
-          files: '**'
-          archive-artifacts: ''
+    mvn-settings: 'dcaegen2-platform-blueprints-settings'
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'

diff --git a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml
index 52e7ce3..86f4321 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml
@@ -11,11 +11,12 @@
     stream:
       - 'master':
           branch: 'master'
-          mvn-settings: 'dcaegen2-platform-cdapbroker-settings'
-          # due to a strange macro / variable translation problem this needs
-          # to be passed as a string block to properly get the properties
-          # correctly defined in the job
-          maven-deploy-properties: |
-            deployAtEnd=true
-          files: '**'
-          archive-artifacts: ''
+    mvn-settings: 'dcaegen2-platform-cdapbroker-settings'
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'

diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml
index f200bb1..89ea2fe 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-cli.yaml
@@ -11,11 +11,12 @@
     stream:
       - 'master':
           branch: 'master'
-          mvn-settings: 'dcaegen2-platform-cli-settings'
-          # due to a strange macro / variable translation problem this needs
-          # to be passed as a string block to properly get the properties
-          # correctly defined in the job
-          maven-deploy-properties: |
-            deployAtEnd=true
-          files: '**'
-          archive-artifacts: ''
+    mvn-settings: 'dcaegen2-platform-cli-settings'
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'

diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index df4ba7a..95b2717 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -17,3 +17,4 @@
       - 'release-1.0.0':
           branch: 'release-1.0.0'
     mvn-settings: 'dcaegen2-platform-configbinding-settings'
+    build-node: 'ubuntu1604-docker-8c-8g'

diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
index bdc3c8b..d0f8db3 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
@@ -11,11 +11,12 @@
     stream:
       - 'master':
           branch: 'master'
-          mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
-          # due to a strange macro / variable translation problem this needs
-          # to be passed as a string block to properly get the properties
-          # correctly defined in the job
-          maven-deploy-properties: |
-            deployAtEnd=true
-          files: '**'
-          archive-artifacts: ''
+    mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'

diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index 67f3fe3..bce4863 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -11,11 +11,12 @@
     stream:
       - 'master':
           branch: 'master'
-          mvn-settings: 'dcaegen2-platform-inventory-api-settings'
-          # due to a strange macro / variable translation problem this needs
-          # to be passed as a string block to properly get the properties
-          # correctly defined in the job
-          maven-deploy-properties: |
-            deployAtEnd=true
-          files: '**'
-          archive-artifacts: ''
+    mvn-settings: 'dcaegen2-platform-inventory-api-settings'
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'

diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
index 9d29b83..d617db4 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
@@ -11,11 +11,12 @@
     stream:
       - 'master':
           branch: 'master'
-          mvn-settings: 'dcaegen2-platform-plugins-settings'
-          # due to a strange macro / variable translation problem this needs
-          # to be passed as a string block to properly get the properties
-          # correctly defined in the job
-          maven-deploy-properties: |
-            deployAtEnd=true
-          files: '**'
-          archive-artifacts: ''
+    mvn-settings: 'dcaegen2-platform-plugins-settings'
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'

diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
index 0104543..da23a59 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
@@ -11,11 +11,12 @@
     stream:
       - 'master':
           branch: 'master'
-          mvn-settings: 'dcaegen2-platform-policy-handler-settings'
-          # due to a strange macro / variable translation problem this needs
-          # to be passed as a string block to properly get the properties
-          # correctly defined in the job
-          maven-deploy-properties: |
-            deployAtEnd=true
-          files: '**'
-          archive-artifacts: ''
+    mvn-settings: 'dcaegen2-platform-policy-handler-settings'
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'

diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
index 7aceae0..1108cc7 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
@@ -11,11 +11,12 @@
     stream:
       - 'master':
           branch: 'master'
-          mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
-          # due to a strange macro / variable translation problem this needs
-          # to be passed as a string block to properly get the properties
-          # correctly defined in the job
-          maven-deploy-properties: |
-            deployAtEnd=true
-          files: '**'
-          archive-artifacts: ''
+    mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'

diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 594978e..2eca1fa 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -11,11 +11,12 @@
     stream:
       - 'master':
           branch: 'master'
-          mvn-settings: 'dcaegen2-utils-settings'
-          # due to a strange macro / variable translation problem this needs
-          # to be passed as a string block to properly get the properties
-          # correctly defined in the job
-          maven-deploy-properties: |
-            deployAtEnd=true
-          files: '**'
-          archive-artifacts: ''
+    mvn-settings: 'dcaegen2-utils-settings'
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'

diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml
index 62d24bc..c9a81dc 100644 (file)
--- a/jjb/dcaegen2/dcaegen2.yaml
+++ b/jjb/dcaegen2/dcaegen2.yaml
@@ -11,11 +11,12 @@
     stream:
       - 'master':
           branch: 'master'
-          mvn-settings: 'dcaegen2-settings'
-          # due to a strange macro / variable translation problem this needs
-          # to be passed as a string block to properly get the properties
-          # correctly defined in the job
-          maven-deploy-properties: |
-            deployAtEnd=true
-          files: '**'
-          archive-artifacts: ''
+    mvn-settings: 'dcaegen2-settings'
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'