X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fmsb%2Fmsb-discovery.yaml;h=054016d2b2e9d16f4361384f255abb8623a4a7ff;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;hp=3ffdc229e3e65e2e7f674fde6d83871baf8d6a28;hpb=16e7a2479e5e474a92c5a010c23a20559d71686a;p=ci-management.git

diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index 3ffdc229e..7f7f2d86e 100644
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -1,43 +1,56 @@
 ---
 - project:
     name: msb-discovery
-    project-name: 'msb-discovery'
+    project-name: "msb-discovery"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-discovery-docker-image.sh'
-    project: 'msb/discovery'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          build-node: centos8-docker-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          sbom-generator: true
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-pom: "distributions/msb-discovery/pom.xml"
+          mvn-params: "-f distributions/msb-discovery/pom.xml -Dmaven.test.skip=true -P linux,docker"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    project: "msb/discovery"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'msb-discovery-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+      - "master":
+          branch: "master"
+    mvn-settings: "msb-discovery-settings"
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: msb-discovery-sonar
     jobs:
       - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'msb/discovery'
-    project-name: 'msb-discovery'
-    branch: 'master'
-    mvn-settings: 'msb-discovery-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    sonarcloud: true
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    build-node: ubuntu1804-builder-4c-4g
+    project: "msb/discovery"
+    project-name: "msb-discovery"
+    branch: "master"
+    mvn-settings: "msb-discovery-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: msb-discovery-clm
     jobs:
       - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
     project: msb/discovery
-    project-name: 'msb-discovery'
-    branch: 'master'
-    mvn-settings: 'msb-discovery-settings'
+    project-name: "msb-discovery"
+    branch: "master"
+    mvn-settings: "msb-discovery-settings"