Make code sections readable and consistent

[ci-management.git] / jjb / ccsdk / distribution.yaml

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index c7dd5e1..d0a8f07 100644 (file)
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -7,29 +7,20 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily'
-      - '{project-name}-{stream}-docker-version-java-daily'
+      - '{project-name}-{stream}-docker-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
+      - '{project-name}-{stream}-docker-version-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
 
     project: 'ccsdk/distribution'
     stream:
       - 'master':
           branch: 'master'
-      - 'amsterdam':
-          branch: 'amsterdam'
+      - 'beijing':
+          branch: 'beijing'
     mvn-settings: 'ccsdk-distribution-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-docker-8c-8g
-- project:
-    name: ccsdk-distribution-sonar
-    jobs:
-      - gerrit-maven-sonar
-    build-node: ubuntu1604-basebuild-4c-4g
-    project: 'ccsdk/distribution'
-    project-name: 'ccsdk-distribution'
-    branch: 'master'
-    mvn-settings: 'ccsdk-distribution-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'