[DCAE] Remove istanbul branch job

[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 8896237..1e551bf 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -4,11 +4,15 @@
     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: true
-          build-node: centos7-docker-8c-8g
+          sign-artifacts: false
+          sbom-generator: true
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
@@ -22,8 +26,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'jakarta':
+          branch: 'jakarta'
     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
@@ -33,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
@@ -55,13 +62,16 @@
 
 - project:
     name: dcaegen2-collectors-ves-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     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: