From 8559326c5223d2912d3da4cb69782ae2d8b97429 Mon Sep 17 00:00:00 2001
From: Rashmi Pujar <rashmi.pujar@bell.ca>
Date: Mon, 17 Jun 2019 10:46:06 -0400
Subject: Change policy/apex-pdp build node to docker

The policy/apex-pdp 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/apex-pdp/+/90014/

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

(limited to 'jjb/policy')

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index e1cfe9d4a..9c9f562bc 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -10,19 +10,15 @@
     project-name: 'policy-apex-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':
-          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/apex-pdp'
     stream:
       - 'master':
@@ -30,7 +26,7 @@
     mvn-settings: 'policy-apex-pdp-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
 
 - project:
     name: policy-apex-pdp-dublin
-- 
cgit 1.2.3-korg