Merge "Manage ci-management view in JJB"

[ci-management.git] / jjb / aai / aai-champ.yaml

diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
index 527c0c6..b85973b 100644 (file)
--- a/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@ -1,18 +1,20 @@
 ---
+- project:
+    name: aai-champ-project-view
+    project-name: aai-champ
+    views:
+      - project-view
+
 - project:
     name: aai-champ
     project-name: 'aai-champ'
     jobs:
-      - gerrit-maven-clm:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
-      - '{project-name}-{stream}-stage-site-java':
-          site-pom: 'pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily'
-          disabled: true
-
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'champ-service/pom.xml'
+          mvn-goals: 'docker:build'
     project: 'aai/champ'
     stream:
       - 'master':
@@ -20,16 +22,26 @@
     mvn-settings: 'aai-champ-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-basebuild-4c-4g
+    build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: aai-champ-sonar
     jobs:
       - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-basebuild-4c-4g
+    cron: '@daily'
+    build-node: ubuntu1604-builder-4c-4g
     project: 'aai/champ'
     project-name: 'aai-champ'
     branch: 'master'
     mvn-settings: 'aai-champ-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aai-champ-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/champ'
+    project-name: 'aai-champ'
+    branch: 'master'
+    mvn-settings: 'aai-champ-settings'