Merge "Fix clm build"

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 030472a..fe1d7e2 100644 (file)
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -11,6 +11,7 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-merge.sh'
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'clean deploy -B

diff --git a/jjb/vvp/vvp-cms.yaml b/jjb/vvp/vvp-cms.yaml
index 027deb2..903df18 100644 (file)
--- a/jjb/vvp/vvp-cms.yaml
+++ b/jjb/vvp/vvp-cms.yaml
@@ -12,7 +12,7 @@
           path: '.'
           pattern: '**'
     mvn-settings: 'vvp-cms-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     jobs:
       - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
@@ -24,7 +24,7 @@
     jobs:
       - gerrit-maven-sonar
     cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     project: 'vvp/cms'
     project-name: 'vvp-cms'
     branch: 'master'

diff --git a/jjb/vvp/vvp-engagementmgr.yaml b/jjb/vvp/vvp-engagementmgr.yaml
index 5ba163b..4516970 100644 (file)
--- a/jjb/vvp/vvp-engagementmgr.yaml
+++ b/jjb/vvp/vvp-engagementmgr.yaml
@@ -12,7 +12,7 @@
           path: '.'
           pattern: '**'
     mvn-settings: 'vvp-engagementmgr-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     jobs:
       - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
@@ -24,7 +24,7 @@
     jobs:
       - gerrit-maven-sonar
     cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     project: 'vvp/engagementmgr'
     project-name: 'vvp-engagementmgr'
     branch: 'master'

diff --git a/jjb/vvp/vvp-image-scanner.yaml b/jjb/vvp/vvp-image-scanner.yaml
index 55c3adf..0fd2112 100644 (file)
--- a/jjb/vvp/vvp-image-scanner.yaml
+++ b/jjb/vvp/vvp-image-scanner.yaml
@@ -12,7 +12,7 @@
           path: '.'
           pattern: '**'
     mvn-settings: 'vvp-image-scanner-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     jobs:
       - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
@@ -24,7 +24,7 @@
     jobs:
       - gerrit-maven-sonar
     cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     project: 'vvp/image-scanner'
     project-name: 'vvp-image-scanner'
     branch: 'master'

diff --git a/jjb/vvp/vvp-jenkins.yaml b/jjb/vvp/vvp-jenkins.yaml
index 447766b..b78e0d2 100644 (file)
--- a/jjb/vvp/vvp-jenkins.yaml
+++ b/jjb/vvp/vvp-jenkins.yaml
@@ -12,7 +12,7 @@
           path: '.'
           pattern: '**'
     mvn-settings: 'vvp-jenkins-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     jobs:
       - gerrit-python-xc-clm:
       - '{project-name}-{stream}-{subproject}-verify-python'
@@ -24,10 +24,10 @@
     jobs:
       - gerrit-maven-sonar
     cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     project: 'vvp/jenkins'
     project-name: 'vvp-jenkins'
     branch: 'master'
     mvn-settings: 'vvp-jenkins-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml
index 71bbbc8..85287cd 100644 (file)
--- a/jjb/vvp/vvp-test-engine.yaml
+++ b/jjb/vvp/vvp-test-engine.yaml
@@ -12,7 +12,7 @@
           path: '.'
           pattern: '**'
     mvn-settings: 'vvp-test-engine-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     jobs:
       - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
@@ -24,7 +24,7 @@
     jobs:
       - gerrit-maven-sonar
     cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     project: 'vvp/test-engine'
     project-name: 'vvp-test-engine'
     branch: 'master'