Merge "PORTAL-SDK-Refactor CLM project block"

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

diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index da2c234..faf9d44 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -7,16 +7,12 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'amsterdam':
-          branch: 'amsterdam'
     mvn-settings: 'vfc-gvnfm-vnflcm-settings'
     subproject:
       - 'lcm':
           pom: 'lcm/pom.xml'
           pattern: 'lcm/**'
     jobs:
-      - gerrit-maven-clm:
-          java-version: ''
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -27,16 +23,28 @@
             !include-raw-escape: 'build-gvnfm-vnflcm-docker-image.sh'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-basebuild-4c-4g
+    build-node: centos7-redis-4c-4g
+
 - project:
-    name: vfc-gvnfm-vnflcm-sonar
+    name: vfc-gvnfm-vnflcm-lcm-sonar
     jobs:
       - gerrit-maven-sonar
-    build-node: ubuntu1604-basebuild-4c-4g
-    java-version: ''
+    cron: '@daily'
+    mvn-params: '-f lcm/pom.xml'
+    build-node: centos7-redis-4c-4g
     project: 'vfc/gvnfm/vnflcm'
-    project-name: 'vfc-gvnfm-vnflcm'
+    project-name: 'vfc-gvnfm-vnflcm-lcm'
     branch: 'master'
     mvn-settings: 'vfc-gvnfm-vnflcm-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-vnflcm-java-clm
+    jobs:
+      - gerrit-maven-clm
+    project: vfc/gvnfm/vnflcm
+    project-name: 'vfc-gvnfm-vnflcm'
+    build-node: centos7-redis-4c-4g
+    branch: 'master'
+    mvn-settings: 'vfc-gvnfm-vnflcm-settings'