Chore: Move to centos8-builder

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

diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index bfd9e25..b3fd439 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -4,10 +4,14 @@
     project-name: 'dcaegen2-collectors-ves'
     java-version: openjdk11
     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
+      # - '{project-name}-{stream}-verify-java'
+      # - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: false
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
@@ -22,10 +26,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'dcaegen2-collectors-ves-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
@@ -35,6 +37,9 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1804-docker-8c-8g'
+    mvn-snapshot-id: 'ecomp-snapshots'
+    mvn-version: 'mvn36'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: dcaegen2-collectors-ves-sonar
@@ -43,7 +48,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'
@@ -64,7 +68,9 @@
     project: dcaegen2/collectors/ves
     build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-collectors-ves'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
     mvn-settings: 'dcaegen2-collectors-ves-settings'
 
 - project:
@@ -72,6 +78,6 @@
     project-name: dcaegen2-collectors-ves
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/collectors/ves
     branch: master