From 7e5c1e09165605ebcee150792c691becc7d19113 Mon Sep 17 00:00:00 2001
From: Guobiao Mo <guobiaomo@chinamobile.com>
Date: Tue, 26 Mar 2019 11:36:09 -0700
Subject: For DataLake DCAE handler

Follow /ci-management/jjb/dcaegen2/
dcaegen2-services-bbs-eventprocessor-java.yaml

Issue-ID: DCAEGEN2-1189
Change-Id: Ic6e2c6651ec9764fda0ff8300ba513278b0ec06b
Signed-off-by: Guobiao Mo <guobiaomo@chinamobile.com>
---
 .../dcaegen2-services-datalake-handler.yaml        | 25 +++++++++-------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 5689bfc3f..2d8973637 100644
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -1,25 +1,20 @@
 ---
 - project:
     name: dcaegen2-services-datalake-handler
+    project: 'dcaegen2/services'
     project-name: 'dcaegen2-services-datalake-handler'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-shell-daily':
-          mvn-goals: 'clean package docker:build -DpushImage'
-          # No-op
-          script: '/bin/true'
-          build-node: 'ubuntu1604-docker-8c-8g'
-    project: 'dcaegen2/services'
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+    subproject:
+      - 'datalake-handler':
+          pom: 'components/datalake-handler/pom.xml'
+          pattern: 'components/datalake-handler/**'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'dcaegen2-services-settings'
-    mvn-params: '-f components/datalake-handler/pom.xml'
-    # 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: '**'
@@ -31,11 +26,11 @@
     jobs:
       - gerrit-maven-sonar
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     project: 'dcaegen2/services'
     project-name: 'dcaegen2-services-datalake-handler'
     branch: 'master'
-    mvn-params: '-f components/datalake-handler/pom.xml'
     mvn-settings: 'dcaegen2-services-settings'
+    mvn-params: '-f components/datalake-handler/pom.xml'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-- 
cgit 1.2.3-korg