X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-services-datalake-handler.yaml;h=017eb64200c56d6ce11c590094a167e0ac492ae5;hb=3ef72cb52ca6acda83d2bb092b1371f8af798094;hp=44f8155b0094036d899dada2bfb5362fa611201c;hpb=541ff022db982b4261e440d7a1cf3a3042793f54;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 44f8155b0..017eb6420 100644
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -18,43 +18,77 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
-#- project:
-#    name: dcaegen2-services-datalake-handler-release
-#    project: 'dcaegen2/services'
-#    project-name: 'dcaegen2-services-datalake-handler'
-#    jobs:
-#      - gerrit-maven-stage:
-#          sign-artifacts: true
-#          build-node: centos7-builder-4c-4g
-#          maven-versions-plugin: true
-#          mvn-pom: 'components/datalake-handler/pom.xml'
-#          mvn-params: '-f components/datalake-handler/pom.xml'
-#          version-properties-file: 'components/datalake-handler/version.properties'
-#          pattern: 'components/datalake-handler/**'
-#      - gerrit-maven-docker-stage:
-#          build-node: ubuntu1604-docker-8c-8g
-#          mvn-goals: 'clean package docker:build -DpushImage -f components/datalake-handler/pom.xml'
-#          container-public-registry: 'nexus3.onap.org:10001'
-#          container-staging-registry: 'nexus3.onap.org:10003'
-#          pattern: 'components/datalake-handler/**'
+- project:
+    name: dcaegen2-services-datalake-handler-release
+    project: 'dcaegen2/services'
+    project-name: 'dcaegen2-services-datalake-handler'
+    jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'components/datalake-handler/pom.xml'
+          mvn-params: '-f components/datalake-handler/pom.xml'
+          version-properties-file: 'components/datalake-handler/version.properties'
+          pattern: 'components/datalake-handler/**'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/feeder/pom.xml'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          pattern: 'components/datalake-handler/**'
     stream:
       - 'master':
-          branch: 'master'
+         branch: 'master'
+    mvn-settings: 'dcaegen2-services-settings'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1804-docker-8c-8g'
+
+- project:
+    name: dcaegen2-services-datalake-handler-admin-ui-release
+    project: 'dcaegen2/services'
+    project-name: 'dcaegen2-services-datalake-handler-admin-ui'
+    jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'components/datalake-handler/pom.xml'
+          mvn-params: '-f components/datalake-handler/pom.xml'
+          version-properties-file: 'components/datalake-handler/version.properties'
+          pattern: 'components/datalake-handler/**'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/admin/pom.xml'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          pattern: 'components/datalake-handler/**'
+    stream:
+      - 'master':
+         branch: 'master'
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-services-datalake-handler-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/services'
     project-name: 'dcaegen2-services-datalake-handler'
     branch: 'master'