summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2019-08-07 19:33:54 +0000
committerGerrit Code Review <gerrit@onap.org>2019-08-07 19:33:54 +0000
commit6888a4b539b2b80d02fdd85a859d0d0047e7d414 (patch)
tree4df7c41df0b85a12a6c3f9c7a0f1bdb9463998ae
parent8d4b0909560419cde171bfd9277bcce6d5e54b62 (diff)
parent1b1f672836a78cbaf7f619b447f9d137b6ecb70f (diff)
Merge "Add docker stage job for common images"
-rw-r--r--jjb/aai/aai-aai-common.yaml9
-rw-r--r--jjb/aai/aai-sparky-fe.yaml3
2 files changed, 8 insertions, 4 deletions
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 5508f1000..cbf92fe12 100644
--- 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 312b36d73..d85fbbc8d 100644
--- 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: