Make code sections readable and consistent

[ci-management.git] / jjb / aai / aai-data-router.yaml

diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index beb6279..7d8a780 100644 (file)
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -14,33 +14,18 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'beijing':
+          branch: 'beijing'
     mvn-settings: 'aai-data-router-settings'
     files: '**'
     archive-artifacts: ''
-- project:
-    name: aai-data-router-releases
-    project-name: 'aai-data-router'
-    jobs:
-      - gerrit-maven-clm:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'pom.xml'
-          mvn-goals: 'docker:build'
-    project: 'aai/data-router'
-    stream:
-      - 'amsterdam':
-          branch: 'amsterdam'
-    mvn-settings: 'aai-data-router-settings'
-    files: '**'
-    archive-artifacts: ''
+
 - project:
     name: aai-data-router-sonar
     jobs:
       - gerrit-maven-sonar
     cron: 'H 11 * * *'
-    build-node: ubuntu1604-basebuild-4c-4g
+    build-node: ubuntu1604-builder-4c-4g
     project: 'aai/data-router'
     project-name: 'aai-data-router'
     branch: 'master'