X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fmsb%2Fmsb-discovery.yaml;h=72fab4cccd2249c034c3f129c08ee8b137e0574d;hb=ffc3ac818c92944c9b956633550a461457d10d36;hp=53976484c2f88e7587e6481a74d08658c13626ae;hpb=a2d56568a46e220010abff754d479c7f6e6649f8;p=ci-management.git

diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index 53976484c..72fab4ccc 100644
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -5,46 +5,59 @@
     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'
-          build-node: ubuntu1604-docker-8c-8g
-    project: 'msb/discovery'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'msb-discovery-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: msb-discovery-arm64
-    project-name: 'msb-discovery-arm64'
-    jobs:
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-discovery-docker-image.sh'
-          build-node: ubuntu1604-docker-arm64-4c-2g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          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-8c-8g
     project: 'msb/discovery'
     stream:
       - 'master':
           branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'msb-discovery-settings'
     files: '**'
     archive-artifacts: ''
+    build-node: ubuntu1804-builder-4c-4g
 
+#- project:
+#    name: msb-discovery-arm64
+#    project-name: 'msb-discovery-arm64'
+#    jobs:
+#      - '{project-name}-{stream}-docker-java-version-shell-daily':
+#          docker-pom: 'pom.xml'
+#          mvn-goals: 'install'
+#          script:
+#            !include-raw-escape: 'build-discovery-docker-image.sh'
+#          build-node: ubuntu1804-docker-arm64-4c-2g
+#    project: 'msb/discovery'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'msb-discovery-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#
 - project:
     name: msb-discovery-sonar
     jobs:
       - 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'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'msb/discovery'
     project-name: 'msb-discovery'
     branch: 'master'
@@ -61,3 +74,12 @@
     project-name: 'msb-discovery'
     branch: 'master'
     mvn-settings: 'msb-discovery-settings'
+
+- project:
+    name: msb-discovery-info
+    project-name: msb-discovery
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: msb/discovery
+    branch: master