Merge "Update memcached/redis packer templates"

[ci-management.git] / jjb / aai / aai-esr-server.yaml

diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml
index e59629a..b5df9c8 100644 (file)
--- a/jjb/aai/aai-esr-server.yaml
+++ b/jjb/aai/aai-esr-server.yaml
@@ -3,11 +3,11 @@
     name: aai-esr-server-master
     project-name: 'aai-esr-server'
     jobs:
-      - gerrit-maven-clm:
       - '{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-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
 
     project: 'aai/esr-server'
     stream:
@@ -18,36 +18,26 @@
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-basebuild-4c-4g
-- project:
-    name: aai-esr-server-releases
-    project-name: 'aai-esr-server'
-    jobs:
-      - gerrit-maven-clm:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily'
+    build-node: ubuntu1604-builder-4c-4g
 
-    project: 'aai/esr-server'
-    stream:
-      - 'amsterdam':
-          branch: 'amsterdam'
-    mvn-settings: 'aai-esr-server-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: docker
-    build-node: ubuntu1604-basebuild-4c-4g
 - project:
     name: aai-esr-server-sonar
     jobs:
       - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-basebuild-4c-4g
+    cron: '@daily'
+    build-node: ubuntu1604-builder-4c-4g
     project: 'aai/esr-server'
     project-name: 'aai-esr-server'
     branch: 'master'
     mvn-settings: 'aai-esr-server-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aai-esr-server-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/esr-server'
+    project-name: 'aai-esr-server'
+    branch: 'master'
+    mvn-settings: 'aai-esr-server-settings'