X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-services-son-handler.yaml;h=5d69ca6628e1b10c9de6df299349ba1ac68e0593;hb=a29dd524cc61ad4692b5ba0fee58c2276ffa0917;hp=99055a746a42fa606a9e28b56e0c37cbaac2eac6;hpb=688dfb172ac67db03b6205deb1c84f157b23083f;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index 99055a746..5d69ca662 100644
--- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -1,64 +1,67 @@
 ---
 - project:
     name: dcaegen2-services-son-handler
-    project-name: 'dcaegen2-services-son-handler'
+    project-name: "dcaegen2-services-son-handler"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify:
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+      - gerrit-maven-merge
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          sbom-generator: true
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-goals: 'clean package docker:build -DpushImageTag'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-
-    project: 'dcaegen2/services/son-handler'
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-goals: "clean package docker:build -DpushImageTag"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    project: "dcaegen2/services/son-handler"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-    mvn-settings: 'dcaegen2-services-son-handler-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+      - "master":
+          branch: "master"
+      - "london":
+          branch: "london"
+    java-version: openjdk11
+    mvn-settings: "dcaegen2-services-son-handler-settings"
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
     maven-deploy-properties: |
       deployAtEnd=true
 
 - project:
     name: dcaegen2-services-son-handler-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
-    project: 'dcaegen2/services/son-handler'
-    project-name: 'dcaegen2-services-son-handler'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-services-son-handler-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    sonarcloud: true
+    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/son-handler"
+    project-name: "dcaegen2-services-son-handler"
+    branch: "master"
+    mvn-settings: "dcaegen2-services-son-handler-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: dcaegen2-services-son-handler-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: dcaegen2/services/son-handler
-    build-node: ubuntu1604-docker-8c-8g
-    project-name: 'dcaegen2-services-son-handler'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-services-son-handler-settings'
-
-- project:
-    name: dcaegen2-services-son-handler-info
-    project-name: dcaegen2-services-son-handler
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/services/son-handler
-    branch: master
+    build-node: ubuntu1804-docker-8c-8g
+    project-name: "dcaegen2-services-son-handler"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "dcaegen2-services-son-handler-settings"