Make code sections readable and consistent

[ci-management.git] / jjb / multicloud / multicloud-framework-java.yaml

diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 589f327..78dfaff 100644 (file)
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -6,14 +6,15 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'amsterdam':
-          branch: 'amsterdam'
     mvn-settings: 'multicloud-framework-settings'
     subproject:
       - 'multivimbroker':
           pom: 'multivimbroker/pom.xml'
           pattern: 'multivimbroker/**'
     jobs:
+      - gerrit-maven-clm
+      - '{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'
@@ -24,16 +25,17 @@
             !include-raw-escape: 'build-multicloud-framework-docker-image.sh'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-basebuild-4c-4g
+    build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: multicloud-framework-sonar
     jobs:
       - gerrit-maven-sonar
     cron: 'H 11 * * *'
-    build-node: ubuntu1604-basebuild-4c-4g
+    build-node: ubuntu1604-builder-4c-4g
     project: 'multicloud/framework'
     project-name: 'multicloud-framework'
     branch: 'master'
     mvn-settings: 'multicloud-framework-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'