[DCAE] Remove istanbul branch job

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

diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
old mode 100755 (executable)
new mode 100644 (file)
index 55c5e90..d42888b
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -6,24 +6,28 @@
     stream:
       - 'master':
           branch: 'master'
-          java-version: openjdk11
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'jakarta':
+          branch: 'jakarta'
+    java-version: openjdk11
     # apply to all jobs
     project: 'dcaegen2/services/pm-mapper'
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     maven-deploy-properties: |
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-docker-8c-8g
     jobs:
-      - '{project-name}-{stream}-verify-java':
-        mvn-goals: 'clean install docker:build'
-      - '{project-name}-{stream}-merge-java':
-        mvn-goals: 'clean deploy'
+      - gerrit-maven-verify:
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+          mvn-goals: 'clean install docker:build'
+      - gerrit-maven-merge:
+          mvn-goals: 'clean deploy'
       - gerrit-maven-stage:
           sign-artifacts: true
+          sbom-generator: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
@@ -61,7 +65,9 @@
     project: dcaegen2/services/pm-mapper
     build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-services-pm-mapper'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
     java-version: openjdk11
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'