X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fmulticloud%2Fmulticloud-framework-java.yaml;h=988d38387ac0e0ad54544e8d527f91c98ed3eb56;hb=ffc3ac818c92944c9b956633550a461457d10d36;hp=d59d92ed016d352552c59cdcdb49f3e26304c098;hpb=51b474342e05c37acefcc99cb7a68852df2f8242;p=ci-management.git

diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index d59d92ed0..988d38387 100644
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -6,68 +6,128 @@
     stream:
       - 'master':
           branch: 'master'
+          java-version: openjdk11
+      - 'guilin':
+          branch: 'guilin'
+          java-version: openjdk11
     mvn-settings: 'multicloud-framework-settings'
     subproject:
       - 'multivimbroker':
           pom: 'multivimbroker/pom.xml'
           pattern: 'multivimbroker/**'
+      - 'artifactbroker':
+          pom: 'artifactbroker/pom.xml'
+          pattern: 'artifactbroker/**'
     jobs:
+      - 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'
       - '{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}-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-framework-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
+#- project:
+#    name: multicloud-framework-arm64-java
+#    project-name: 'multicloud-framework-arm64'
+#    project: 'multicloud/framework'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'multicloud-framework-settings'
+#    subproject:
+#      - 'multivimbroker':
+#          pom: 'multivimbroker/pom.xml'
+#          pattern: 'multivimbroker/**'
+#    jobs:
+#      - '{project-name}-{stream}-docker-java-version-shell-daily':
+#          docker-pom: 'pom.xml'
+#          mvn-goals: 'install'
+#          script:
+#            !include-raw-escape: 'build-multicloud-framework-docker-image.sh'
+#    files: '**'
+#    archive-artifacts: ''
+#    build-node: ubuntu1804-docker-arm64-4c-2g
+#
 - project:
-    name: multicloud-framework-arm64-java
-    project-name: 'multicloud-framework-arm64'
+    name: multicloud-framework-multivimbroker-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: ubuntu1804-builder-4c-4g
     project: 'multicloud/framework'
+    project-name: 'multicloud-framework-multivimbroker'
+    branch: 'master'
+    mvn-params: '-f multivimbroker/pom.xml'
+    mvn-settings: 'multicloud-framework-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: multicloud-framework-multivimbroker-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: multicloud/framework
+    project-name: 'multicloud-framework-multivimbroker'   
     stream:
       - 'master':
           branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
+    mvn-params: '-f multivimbroker/pom.xml'
     mvn-settings: 'multicloud-framework-settings'
-    subproject:
-      - 'multivimbroker':
-          pom: 'multivimbroker/pom.xml'
-          pattern: 'multivimbroker/**'
-    jobs:
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-framework-docker-image.sh'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
 
 - project:
-    name: multicloud-framework-sonar
+    name: multicloud-framework-artifactbroker-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/framework'
-    project-name: 'multicloud-framework'
+    project-name: 'multicloud-framework-artifactbroker'
     branch: 'master'
+    java-version: openjdk11
+    mvn-params: '-f artifactbroker/pom.xml'
     mvn-settings: 'multicloud-framework-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:
-    name: multicloud-framework-java-clm
+    name: multicloud-framework-artifactbroker-clm
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: multicloud/framework
-    project-name: 'multicloud-framework'
-    branch: 'master'
+    project-name: 'multicloud-framework-artifactbroker'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
+    java-version: openjdk11
+    mvn-params: '-f artifactbroker/pom.xml'
     mvn-settings: 'multicloud-framework-settings'