Change APPC docker jobs to use dedicated VM

[ci-management.git] / jjb / appc / appc-deployment.yaml

diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index e59f818..964f15a 100644 (file)
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -5,34 +5,41 @@
     project-name: 'appc-deployment'
     jobs:
       - gerrit-maven-clm:
-          java-version: ''
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
-      - '{project-name}-{stream}-docker-java-daily'
-      - '{project-name}-{stream}-docker-version-java-daily'
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-docker-image-blessing'
 
     project: 'appc/deployment'
     stream:
       - 'master':
           branch: 'master'
-      - 'amsterdam':
-          branch: 'amsterdam'
+      - 'beijing':
+          branch: 'beijing'
     mvn-settings: 'appc-deployment-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-basebuild-4c-4g
+    build-node: ubuntu1604-builder-4c-4g
+
 - project:
-    name: appc-deployment-sonar
+    name: appc-deployment-docker
+    project-name: 'appc-deployment'
     jobs:
-      - gerrit-maven-sonar
-    java-version: ''
+      - 'docker-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
+      - 'docker-version-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
     project: 'appc/deployment'
-    project-name: 'appc-deployment'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'beijing':
+          branch: 'beijing'
     mvn-settings: 'appc-deployment-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    files: '**'
+    archive-artifacts: ''
+    docker-pom: 'pom.xml'
+    mvn-profile: docker
+    build-node: queue-docker-4c-4g