X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fmulticloud%2Fmulticloud-azure-java.yaml;h=d610663233ad92178e66fda1b3875d250b1cf8cd;hb=c69e3630eb71de68d9909fd1c12b967b4b2787f9;hp=10c8d3edfd4e93345bb60679e6ef2b440fbfd725;hpb=8236a6354463f94ce51f7ef7b1f6b87ea37bf712;p=ci-management.git

diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml
index 10c8d3edf..d61066323 100644
--- a/jjb/multicloud/multicloud-azure-java.yaml
+++ b/jjb/multicloud/multicloud-azure-java.yaml
@@ -12,20 +12,24 @@
           pom: 'azure/pom.xml'
           pattern: 'azure/**'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+#      - '{project-name}-{stream}-verify-java'
+#      - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-azure-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+      - 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-goals: install
+          mvn-params: '-P docker'
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-2g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: multicloud-azure-arm64-java
@@ -47,14 +51,19 @@
 #            !include-raw-escape: 'build-multicloud-azure-docker-image.sh'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: multicloud-azure-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: 'multicloud/azure'
     project-name: 'multicloud-azure'
     branch: 'master'
@@ -77,5 +86,6 @@
     project-name: multicloud-azure
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: multicloud/azure
     branch: master