summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2019-07-02 17:48:41 +0000
committerGerrit Code Review <gerrit@onap.org>2019-07-02 17:48:41 +0000
commit4062195add9e0bec3c9c84dd936d96b9302c8c1a (patch)
tree42a04a33f40194ddc62cba8f7f90812bdbb4915a /jjb
parentb641809f1295510502db896c0264905de3078e76 (diff)
parentff3d9d1ef5fa2dfe09ed2f5470cb611ccc18a44c (diff)
Merge "Update champ and chameleon jjbs"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/aai/aai-chameleon.yaml13
-rw-r--r--jjb/aai/aai-champ.yaml12
-rw-r--r--jjb/aai/aai-rest-client.yaml5
-rw-r--r--jjb/aai/aai-router-core-service.yaml5
4 files changed, 25 insertions, 10 deletions
diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml
index a0bd8f3be..7ea108c83 100644
--- a/jjb/aai/aai-chameleon.yaml
+++ b/jjb/aai/aai-chameleon.yaml
@@ -11,11 +11,16 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-{stream}-aai-docker-java-daily':
- pom: 'pom.xml'
- mvn-goals: 'clean package dockerfile:build dockerfile:push'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
+ - gerrit-maven-docker-stage:
+ mvn-params: 'package dockerfile:build dockerfile:push -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
build-node: ubuntu1604-docker-8c-8g
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
+
project: 'aai/chameleon'
stream:
- 'dublin':
diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
index e583e85d5..5b4449e5c 100644
--- a/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@ -11,11 +11,15 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-{stream}-aai-docker-java-daily':
- pom: 'champ-service/pom.xml'
- mvn-goals: 'docker:build'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
+ - gerrit-maven-docker-stage:
+ mvn-params: '-f champ-service/pom.xml docker:build -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: 'aai/champ'
stream:
- 'master':
diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index 3136efedb..1526dd31c 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -11,7 +11,10 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
project: 'aai/rest-client'
stream:
- 'dublin':
diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
index 2816f3f9e..a76033d70 100644
--- a/jjb/aai/aai-router-core-service.yaml
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -11,7 +11,10 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
project: 'aai/router-core'
stream:
- 'dublin':