X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-services-datalake-handler.yaml;h=0b091d6a056ed8fc33c682f552b8956c957256f3;hb=23f648a7707e60e2469953a4a929e1aae903c727;hp=4b43e2c5efab3a4983bba4fd1e2a36a76a2ce7ce;hpb=e610d706a7a5957d92dd7f6edc371dc3a02298c1;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 4b43e2c5e..0b091d6a0 100644
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -1,98 +1,154 @@
 ---
 - project:
     name: dcaegen2-services-datalake-handler
-    project: 'dcaegen2/services'
-    project-name: 'dcaegen2-services-datalake-handler'
+    project: "dcaegen2/services"
+    project-name: "dcaegen2-services-datalake-handler"
     jobs:
-      - '{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/**'
+      - gerrit-maven-verify:
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+      - gerrit-maven-merge
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-services-settings'
+      - "master":
+          branch: "master"
+      - "london":
+          branch: "london"
+    java-version: openjdk11
+    maven-version: "mvn35"
+    mvn-settings: "dcaegen2-services-settings"
+    container-public-registry: "nexus3.onap.org:10001"
+    container-staging-registry: "nexus3.onap.org:10003"
+    mvn-params: "-f components/datalake-handler/pom.xml"
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: "components/datalake-handler/**"
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
     maven-deploy-properties: |
       deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
 
 - project:
     name: dcaegen2-services-datalake-handler-release
-    project: 'dcaegen2/services'
-    project-name: 'dcaegen2-services-datalake-handler'
+    project: "dcaegen2/services"
+    project-name: "dcaegen2-services-datalake-handler"
     jobs:
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          sbom-generator: true
+          sbom-path: "components/datalake-handler/"
+          build-node: centos8-docker-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/**'
+          mvn-pom: "components/datalake-handler/pom.xml"
+          mvn-params: "-f components/datalake-handler/pom.xml"
+          version-properties-file: "components/datalake-handler/version.properties"
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-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/**'
+          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"
     stream:
-      - 'master':
-         branch: 'master'
-    mvn-settings: 'dcaegen2-services-settings'
+      - "master":
+          branch: "master"
+      - "london":
+          branch: "london"
+    java-version: openjdk11
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: "components/datalake-handler/feeder/**"
+    mvn-settings: "dcaegen2-services-settings"
     maven-deploy-properties: |
       deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    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'
+    project: "dcaegen2/services"
+    project-name: "dcaegen2-services-datalake-handler-admin-ui"
     jobs:
       - gerrit-maven-stage:
+          sbom-generator: true
+          sbom-path: "components/datalake-handler/"
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-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/**'
+          mvn-pom: "components/datalake-handler/pom.xml"
+          mvn-params: "-f components/datalake-handler/pom.xml"
+          version-properties-file: "components/datalake-handler/version.properties"
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-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/**'
+          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"
     stream:
-      - 'master':
-         branch: 'master'
-    mvn-settings: 'dcaegen2-services-settings'
+      - "master":
+          branch: "master"
+      - "london":
+          branch: "london"
+    java-version: openjdk11
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: "components/datalake-handler/admin/**"
+    mvn-settings: "dcaegen2-services-settings"
     maven-deploy-properties: |
       deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
+
+- project:
+    name: dcaegen2-services-datalake-handler-des-release
+    project: "dcaegen2/services"
+    project-name: "dcaegen2-services-datalake-handler-des"
+    jobs:
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sbom-path: "components/datalake-handler/"
+          sign-artifacts: true
+          build-node: centos8-docker-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"
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-goals: "clean package dockerfile:build dockerfile:push -f components/datalake-handler/des/pom.xml"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+    stream:
+      - "master":
+          branch: "master"
+      - "london":
+          branch: "london"
+    java-version: openjdk11
+    mvn-settings: "dcaegen2-services-settings"
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: "**"
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: "components/datalake-handler/des/**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
 
 - project:
     name: dcaegen2-services-datalake-handler-sonar
+    java-version: openjdk11
     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
-    project: 'dcaegen2/services'
-    project-name: 'dcaegen2-services-datalake-handler'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-services-settings'
-    mvn-params: '-f components/datalake-handler/pom.xml'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
+    build-node: ubuntu1804-docker-8c-8g
+    project: "dcaegen2/services"
+    project-name: "dcaegen2-services-datalake-handler"
+    branch: "master"
+    mvn-settings: "dcaegen2-services-settings"
+    mvn-params: "-f components/datalake-handler/pom.xml"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"