X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-services-sdk.yaml;h=7c63d194586e4bb1025a033d8ec7474574474867;hb=0a2909d6b644168de0154f96af8f2a3e70bd6be7;hp=f356e4eb43088a3039f9229f8755d4bbfaf69289;hpb=b5658110a5ad6e9dcef56cb7871a20b3879c7f1b;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index f356e4eb4..7c63d1945 100644
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -3,30 +3,62 @@
     name: dcaegen2-services-sdk
     project-name: 'dcaegen2-services-sdk'
     jobs:
-      - '{project-name}-{stream}-verify-java':
-          build-env-variables: "TESTCONTAINERS_RYUK_DISABLED=true"
-      - '{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:
-          build-node: ubuntu1604-docker-8c-8g
+          sign-artifacts: true
+          sbom-generator: true
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'dcaegen2/services/sdk'
     stream:
       - 'master':
           branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-services-sdk-settings'
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'centos7-docker-8c-8g'
     maven-deploy-properties: |
       deployAtEnd=true
 
+- project:
+    name: dcaegen2-services-sdk-integration-pairwise
+    java-version: openjdk11
+    jobs:
+      - '{project-name}-{stream}-integration-pairwise':
+          build-env-variables: "TESTCONTAINERS_RYUK_DISABLED=true"
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'dcaegen2/services/sdk'
+    project-name: 'dcaegen2-services-sdk'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'dcaegen2-services-sdk-settings'
+    mvn-params: ' -P integration-pairwise'
+
 - project:
     name: dcaegen2-services-sdk-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
+    build-node: centos7-docker-8c-8g
     project: 'dcaegen2/services/sdk'
     project-name: 'dcaegen2-services-sdk'
     branch: 'master'
@@ -36,13 +68,18 @@
 
 - project:
     name: dcaegen2-services-sdk-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/services/sdk
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: centos7-docker-8c-8g
     project-name: 'dcaegen2-services-sdk'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'dcaegen2-services-sdk-settings'
 
 - project:
@@ -50,5 +87,6 @@
     project-name: dcaegen2-services-sdk
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/services/sdk
     branch: master