From 60e60c88b261558144b64fc551e242f6dd001c98 Mon Sep 17 00:00:00 2001
From: Rashmi Pujar <rashmi.pujar@bell.ca>
Date: Mon, 17 Jun 2019 11:52:15 -0400
Subject: Change policy/engine build node to docker

The policy/engine is being changed to use docker-maven-plugin to
build docker images and so they always need to be built on a docker node.

Changed the merge and release to support docker. These
may fail until we get the below review in:
https://gerrit.onap.org/r/#/c/policy/engine/+/90025/

Issue-ID: POLICY-969
Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca>
Change-Id: Iaed6bfe09a8d64cca3847990bbaf30909fb19d77
---
 jjb/policy/policy-engine.yaml | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'jjb')

diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index 5a6e43035..24b686691 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -4,19 +4,15 @@
     project-name: 'policy-engine'
     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':
-          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'
-          disabled: true
-          build-node: ubuntu1604-docker-8c-8g
+      - '{project-name}-{stream}-merge-java':
+         docker-pom: 'pom.xml'
+         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
     project: 'policy/engine'
     stream:
       - 'master':
@@ -24,7 +20,7 @@
     mvn-settings: 'policy-engine-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1604-docker-8c-8g'
 
 - project:
     name: policy-engine-dublin
-- 
cgit 1.2.3-korg