Merge "Remove maven jjb for python-test-utils"

[ci-management.git] / jjb / dcaegen2 / dcaegen2-services-datalake-handler.yaml

diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 5689bfc..44f8155 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -1,25 +1,48 @@
 ---
 - 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'
+    subproject:
+      - 'datalake-handler':
+          pom: 'components/datalake-handler/pom.xml'
+          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'
+
+#- 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/**'
     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 +54,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'