Merge "Fix Clamp merge job"

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

diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index 220e3cf..edffd6b 100644 (file)
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -6,43 +6,21 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-docker-8c-8g
-          maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-docker-image-blessing'
 
     project: 'appc/deployment'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'appc-deployment-settings'
+    maven-version: "mvn35"
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
-#- project:
-#    name: appc-deployment-arm64
-#    project-name: 'appc-deployment-arm64'
-#    jobs:
-#      - '{project-name}-docker-image-blessing'
-#
-#    project: 'appc/deployment'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'appc-deployment-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    docker-pom: 'pom.xml'
-#    mvn-profile: docker
-#    build-node: ubuntu1604-docker-arm64-4c-2g
-#
 - project:
     name: appc-deployment-docker
     project-name: 'appc-deployment'
@@ -51,18 +29,27 @@
           mvn-params: '-Dmaven.test.skip=true'
       - 'docker-version-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+          maven-versions-plugin: true
+          mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
+          java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'appc/deployment'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'appc-deployment-settings'
+    maven-version: "mvn35"
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 #- project:
 #    name: appc-deployment-arm64-docker
@@ -81,12 +68,13 @@
 #    archive-artifacts: ''
 #    docker-pom: 'pom.xml'
 #    mvn-profile: docker
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
     name: appc-deployment-info
     project-name: appc-deployment
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: appc/deployment
     branch: master