Merge "Increase timeout for clamp-maven-clm-master"

[ci-management.git] / jjb / vfc / vfc-gvnfm-vnfres-java.yaml

diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index b8580e3..124c64c 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -7,15 +7,12 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'amsterdam':
-          branch: 'amsterdam'
     mvn-settings: 'vfc-gvnfm-vnfres-settings'
     subproject:
       - 'res':
           pom: 'res/pom.xml'
           pattern: 'res/**'
     jobs:
-      - gerrit-maven-clm:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -24,17 +21,50 @@
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-gvnfm-vnfres-docker-image.sh'
+          build-node: ubuntu1604-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-basebuild-4c-4g
+    build-node: ubuntu1604-builder-4c-4g
+
 - project:
-    name: vfc-gvnfm-vnfres-sonar
+    name: vfc-gvnfm-vnfres-java-arm64
+    project-name: 'vfc-gvnfm-vnfres-arm64'
+    project: 'vfc/gvnfm/vnfres'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'vfc-gvnfm-vnfres-settings'
+    jobs:
+      - '{project-name}-{stream}-docker-java-version-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-gvnfm-vnfres-docker-image.sh'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-docker-arm64-4c-2g
+
+- project:
+    name: vfc-gvnfm-vnfres-res-sonar
     jobs:
       - gerrit-maven-sonar
-    build-node: ubuntu1604-basebuild-4c-4g
+    cron: '@daily'
+    mvn-params: '-f res/pom.xml'
+    build-node: ubuntu1604-builder-4c-4g
     project: 'vfc/gvnfm/vnfres'
-    project-name: 'vfc-gvnfm-vnfres'
+    project-name: 'vfc-gvnfm-vnfres-res'
     branch: 'master'
     mvn-settings: 'vfc-gvnfm-vnfres-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vfc-gvnfm-vnfres-java-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: vfc/gvnfm/vnfres
+    project-name: 'vfc-gvnfm-vnfres'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'vfc-gvnfm-vnfres-settings'