Prep repos for global jjb
Issue-ID: AAI-2478
Issue-ID: AAI-2479
Issue-ID: AAI-2480
Issue-ID: AAI-2493
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: Iac93483d89bb973ef399e133d51d552194e41a2c
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 2a6b9a2..3d75dde 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -11,7 +11,6 @@
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
diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml
index 3dc5d77..0947e87 100644
--- a/jjb/aai/aai-cacher.yaml
+++ b/jjb/aai/aai-cacher.yaml
@@ -5,12 +5,16 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-{stream}-docker-java-daily':
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
- mvn-params: '-Dmaven.test.skip=true'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
+ - 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: 'aai/cacher'
stream:
- 'master':
diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml
index 5b8efe5..8145631 100644
--- a/jjb/aai/aai-event-client.yaml
+++ b/jjb/aai/aai-event-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/event-client'
stream:
- 'dublin':
diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index e44d769..d2ee0bf 100644
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -11,12 +11,16 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-{stream}-docker-java-daily':
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
- mvn-params: '-Dmaven.test.skip=true'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
+ - 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: 'aai/graphadmin'
stream:
- 'master':
diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index b4383aa..6a9453e 100644
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-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/logging-service'
stream:
- 'dublin':