Make code sections readable and consistent

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

diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index cd080b3..8dfd630 100644 (file)
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -7,49 +7,27 @@
       - '{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'
-      - '{project-name}-{stream}-aai-docker-java-version-daily':
-          pom: 'aai-resources/pom.xml'
-          mvn-goals: 'docker:build docker:push'
-
+      - '{project-name}-{stream}-docker-java-daily':
+          docker-pom: 'aai-resources/pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
     project: 'aai/resources'
     stream:
       - 'master':
           branch: 'master'
+      - 'beijing':
+          branch: 'beijing'
     mvn-settings: 'aai-resources-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-basebuild-4c-4g
-- project:
-    name: aai-resources-amsterdam
-    project-name: 'aai-resources'
-    jobs:
-      - gerrit-maven-clm:
-      - '{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'
-      - '{project-name}-{stream}-aai-docker-java-version-daily':
-          pom: 'aai-resources/pom.xml'
-          mvn-goals: 'docker:build docker:push'
+    build-node: ubuntu1604-builder-4c-4g
 
-    project: 'aai/resources'
-    stream:
-      - 'amsterdam':
-          branch: 'amsterdam'
-    mvn-settings: 'aai-resources-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-basebuild-4c-4g
 - project:
     name: aai-resources-sonar
     jobs:
       - gerrit-maven-sonar
-    build-node: ubuntu1604-basebuild-4c-4g
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
     project: 'aai/resources'
     project-name: 'aai-resources'
     branch: 'master'