commit dc6d9e530b1a6a3d3400972bf4f2c141692d1517
author Pamela Dragosh <pdragosh@research.att.com> Wed Jun 05 14:24:56 2019 -0400
committer Pamela Dragosh <pdragosh@research.att.com> Thu Jun 06 12:56:03 2019 -0400
tree cd71003e20cae11dfb39a38030f39f457d948cf0
parent ea0eb58420e8082dae92b600578aaec0482d4578

Change build node to docker

We are changing these jobs to use Docker maven plugin
so they need to always build on a docker node.

Changed the merge and release to support docker. These
may fail until we get these reviews in:

gerrit.onap.org/r/c/policy/drools-applications/+/89204
https://gerrit.onap.org/r/c/policy/drools-pdp/+/89203

Issue-ID: POLICY-969
Change-Id: Ic02ab24bf95325914e906bfc3c55be0d4947b94a
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

jjb/policy/policy-drools-applications.yaml

diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 66bbb63..a22d850 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -4,19 +4,15 @@
     project-name: 'policy-drools-applications'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-scm-mvn-script':
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'drools-apps-docker-merge.sh'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
+      - '{project-name}-{stream}-merge-java':
           docker-pom: 'pom.xml'
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'drools-apps-docker-release.sh'
+          mvn-profile: 'docker'
+          mvn-params: "-P docker"
+      - '{project-name}-{stream}-docker-version-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-P docker'
           disabled: true
-          build-node: ubuntu1604-docker-8c-8g
 
     project: 'policy/drools-applications'
     stream:
@@ -25,7 +21,7 @@
     mvn-settings: 'policy-drools-applications-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: ubuntu1604-docker-8c-8g
 
 - project:
     name: policy-drools-applications-dublin

jjb/policy/policy-drools-pdp.yaml

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 0bb33b4..8e18ba5 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -4,19 +4,15 @@
     project-name: 'policy-drools-pdp'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-scm-mvn-script':
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-merge.sh'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
+      - '{project-name}-{stream}-merge-java':
           docker-pom: 'pom.xml'
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-release.sh'
+          mvn-profile: 'docker'
+          mvn-params: "-P docker"
+      - '{project-name}-{stream}-docker-version-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-P docker'
           disabled: true
-          build-node: ubuntu1604-docker-8c-8g
     project: 'policy/drools-pdp'
     stream:
       - 'master':
@@ -24,7 +20,7 @@
     mvn-settings: 'policy-drools-pdp-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: ubuntu1604-docker-8c-8g
 
 - project:
     name: policy-drools-pdp-dublin