Chore: Move to centos8-builder

[ci-management.git] / jjb / dcaegen2 / dcaegen2-collectors-hv-ves.yaml

diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index 3ab5a74..e55776b 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -6,28 +6,31 @@
     stream:
       - 'master':
           branch: 'master'
-          java-version: openjdk11
-      - 'frankfurt':
-          branch: 'frankfurt'
-          java-version: openjdk11
+      - 'kohn':
+          branch: 'kohn'
     # apply to all jobs
+    java-version: openjdk11
     project: 'dcaegen2/collectors/hv-ves'
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
     files: '**'
     maven-deploy-properties: |
       deployAtEnd=true
     archive-artifacts: 'hv-collector-coverage/target/site/jacoco-aggregate,**/target/reports/detekt-report.html'
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     build-node: ubuntu1804-docker-8c-8g
     jobs:
-      - '{project-name}-{stream}-verify-java':
+      - gerrit-maven-verify:
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
           mvn-goals: 'clean install'
-      - '{project-name}-{stream}-merge-java':
+      - gerrit-maven-merge:
           mvn-goals: 'clean deploy'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
       - 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
           mvn-goals: 'clean deploy -Ddocker.skip'
       - gerrit-maven-docker-stage:
@@ -43,7 +46,6 @@
       - 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'
@@ -63,7 +65,9 @@
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/collectors/hv-ves
     project-name: 'dcaegen2-collectors-hv-ves'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
     build-node: ubuntu1804-docker-8c-8g
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
 
@@ -73,6 +77,6 @@
     project-name: dcaegen2-collectors-hv-ves
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/collectors/hv-ves
     branch: master