Make code sections readable and consistent

[ci-management.git] / jjb / dmaap / dmaap-buscontroller.yaml

diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index c63d474..f614e63 100644 (file)
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -1,34 +1,39 @@
 ---
+
 - project:
     name: dmaap-buscontroller
     project-name: 'dmaap-buscontroller'
     jobs:
       - gerrit-maven-clm:
-          java-version: ''
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-stage-site-java':
-          site-pom: 'pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily'
-          mvn-goals: 'clean install'
+#
+# see DMAAP-334 for more details, but
+#     - '{project-name}-{stream}-docker-java-daily':
+# doesn't support mvn-goals override, so trying this...
+      - '{project-name}-{stream}-docker-java-shell-daily':
+          mvn-goals: 'clean package -P docker docker:build -DpushImage'
+          # No-op
+          script: '/bin/true'
+
     project: 'dmaap/buscontroller'
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
     mvn-settings: 'dmaap-buscontroller-settings'
     files: '**'
     archive-artifacts: ''
+
 - project:
     name: dmaap-buscontroller-sonar
     jobs:
       - gerrit-maven-sonar
-    java-version: ''
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
     project: 'dmaap/buscontroller'
     project-name: 'dmaap-buscontroller'
     branch: 'master'
     mvn-settings: 'dmaap-buscontroller-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'