From 5a341b278a98b09ddbaee5f1c3a47ee0ceace478 Mon Sep 17 00:00:00 2001 From: wr148d Date: Thu, 20 Jan 2022 16:27:48 -0500 Subject: [PATCH] [AAI] Adding Istanbul to the configs for gerrit-maven-clm as per instructed Issue-ID: AAI-3428 Signed-off-by: wr148d Change-Id: I9dafaa5c4f49ba7605a7a1a908d2b27f2fcda81a --- jjb/aai/aai-aai-common.yaml | 6 ++++-- jjb/aai/aai-babel.yaml | 6 ++++-- jjb/aai/aai-event-client.yaml | 6 ++++-- jjb/aai/aai-graphadmin.yaml | 6 ++++-- jjb/aai/aai-graphgraph.yaml | 6 ++++-- jjb/aai/aai-logging-service.yaml | 6 ++++-- jjb/aai/aai-model-loader.yaml | 6 ++++-- jjb/aai/aai-resources.yaml | 6 ++++-- jjb/aai/aai-rest-client.yaml | 6 ++++-- jjb/aai/aai-router-core-service.yaml | 6 ++++-- jjb/aai/aai-schema-service.yaml | 6 ++++-- 11 files changed, 44 insertions(+), 22 deletions(-) diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 011c031d9..6236f65fc 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -62,8 +62,10 @@ project: 'aai/aai-common' project-name: 'aai-aai-common' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-params: '-P spring-boot-2-1' mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index 1b27130c2..62c32c95f 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -66,8 +66,10 @@ project: 'aai/babel' project-name: 'aai-babel' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'aai-babel-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' java-version: openjdk11 diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml index 76a2471b8..8e1418c78 100644 --- a/jjb/aai/aai-event-client.yaml +++ b/jjb/aai/aai-event-client.yaml @@ -53,8 +53,10 @@ project: 'aai/event-client' project-name: 'aai-event-client' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'aai-event-client-settings' - project: diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index 3c1056a00..020bd1be0 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -63,8 +63,10 @@ project: 'aai/graphadmin' project-name: 'aai-graphadmin' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'aai-graphadmin-settings' mvn-version: 'mvn35' java-version: openjdk8 diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml index 1f8078f23..2b00eeba7 100644 --- a/jjb/aai/aai-graphgraph.yaml +++ b/jjb/aai/aai-graphgraph.yaml @@ -56,8 +56,10 @@ project: 'aai/graphgraph' project-name: 'aai-graphgraph' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'aai-graphgraph-settings' - project: diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index b5cf02ffa..08b31bd6e 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -53,8 +53,10 @@ project: 'aai/logging-service' project-name: 'aai-logging-service' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'aai-logging-service-settings' - project: diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 4bf4846c1..669352172 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -66,8 +66,10 @@ project: 'aai/model-loader' project-name: 'aai-model-loader' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'aai-model-loader-settings' mvn-version: 'mvn36' java-version: openjdk11 diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 70c239626..40477b180 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -67,8 +67,10 @@ project: 'aai/resources' project-name: 'aai-resources' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'aai-resources-settings' mvn-version: 'mvn35' java-version: openjdk8 diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index d305f2f17..78442e2a4 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -53,8 +53,10 @@ project: 'aai/rest-client' project-name: 'aai-rest-client' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'aai-rest-client-settings' - project: diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml index d0b3cac1f..66410d41c 100644 --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@ -53,8 +53,10 @@ project: 'aai/router-core' project-name: 'aai-router-core' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'aai-router-core-settings' - project: diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index 53db28176..b3c6767b3 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -64,8 +64,10 @@ project-name: 'aai-schema-service' java-version: openjdk11 stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'aai-schema-service-settings' mvn-version: 'mvn36' -- 2.16.6