Merge "Add docker stage job for common images"

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 5508f10..cbf92fe 100644 (file)
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -12,8 +12,8 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
-          sign-artifacts: false
-          build-node: ubuntu1604-builder-4c-4g
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
     project: 'aai/aai-common'
     stream:
@@ -68,6 +68,11 @@
     jobs:
       - '{project-name}-{stream}-verify-docker'
       - '{project-name}-{stream}-merge-docker'
+      - gerrit-maven-docker-stage:
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          build-node: ubuntu1604-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
     project-name: 'aai-aai-common'
     project: 'aai/aai-common'
     stream:

diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index 312b36d..d85fbbc 100644 (file)
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -7,8 +7,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: ubuntu1604-builder-4c-4g
           maven-versions-plugin: true
     project: 'aai/sparky-fe'
     stream: