Chore: Move to centos8-builder

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

diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index 5cbb321..8d01e0e 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -3,11 +3,13 @@
     name: dcaegen2-services-sdk
     project-name: 'dcaegen2-services-sdk'
     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: false
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
@@ -16,13 +18,15 @@
     stream:
       - 'master':
           branch: 'master'
-          java-version: openjdk11
-      - 'elalto':
-          branch: 'elalto'
+      - 'kohn':
+          branch: 'kohn'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-services-sdk-settings'
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     files: '**'
     archive-artifacts: ''
-    build-node: 'centos7-docker-8c-8g'
+    build-node: 'centos8-docker-8c-8g'
     maven-deploy-properties: |
       deployAtEnd=true
 
@@ -32,7 +36,7 @@
     jobs:
       - '{project-name}-{stream}-integration-pairwise':
           build-env-variables: "TESTCONTAINERS_RYUK_DISABLED=true"
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/services/sdk'
     project-name: 'dcaegen2-services-sdk'
     stream:
@@ -46,8 +50,12 @@
     java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
+    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: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     project: 'dcaegen2/services/sdk'
     project-name: 'dcaegen2-services-sdk'
     branch: 'master'
@@ -62,9 +70,11 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/services/sdk
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     project-name: 'dcaegen2-services-sdk'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
     mvn-settings: 'dcaegen2-services-sdk-settings'
 
 - project:
@@ -72,6 +82,6 @@
     project-name: dcaegen2-services-sdk
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/services/sdk
     branch: master