Update to ensure push only master branch
Issue-ID: AAI-603
Change-Id: I0a6cd3c9b1574f10c0608f8a312eab8d1ad46fa4
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index faf4ea5..421f4c6 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: aai-aai-common
+ name: aai-aai-common-master
project-name: 'aai-aai-common'
jobs:
- gerrit-maven-clm:
@@ -16,6 +16,25 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'aai-aai-common-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
+- project:
+ name: aai-aai-common-releases
+ project-name: 'aai-aai-common'
+ jobs:
+ - gerrit-maven-clm:
+ java-version: ''
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-stage-site-java':
+ site-pom: 'pom.xml'
+ trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar'
+
+ project: 'aai/aai-common'
+ stream:
- 'amsterdam':
branch: 'amsterdam'
mvn-settings: 'aai-aai-common-settings'
diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index ae83d7f..8d1a837 100644
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: aai-data-router
+ name: aai-data-router-master
project-name: 'aai-data-router'
jobs:
- gerrit-maven-clm:
@@ -15,6 +15,23 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'aai-data-router-settings'
+ files: '**'
+ archive-artifacts: ''
+- project:
+ name: aai-data-router-releases
+ project-name: 'aai-data-router'
+ jobs:
+ - gerrit-maven-clm:
+ java-version: ''
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-aai-docker-java-daily':
+ pom: 'pom.xml'
+ mvn-goals: 'docker:build'
+ project: 'aai/data-router'
+ stream:
- 'amsterdam':
branch: 'amsterdam'
mvn-settings: 'aai-data-router-settings'
diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml
index ba70039..3a9f31c 100644
--- a/jjb/aai/aai-esr-server.yaml
+++ b/jjb/aai/aai-esr-server.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: aai-esr-server
+ name: aai-esr-server-master
project-name: 'aai-esr-server'
jobs:
- gerrit-maven-clm:
@@ -14,6 +14,25 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'aai-esr-server-settings'
+ files: '**'
+ archive-artifacts: ''
+ docker-pom: 'pom.xml'
+ mvn-profile: docker
+ build-node: ubuntu1604-basebuild-4c-4g
+- project:
+ name: aai-esr-server-releases
+ project-name: 'aai-esr-server'
+ jobs:
+ - gerrit-maven-clm:
+ java-version: ''
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-docker-java-daily'
+
+ project: 'aai/esr-server'
+ stream:
- 'amsterdam':
branch: 'amsterdam'
mvn-settings: 'aai-esr-server-settings'
diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index 948447d..326b0c5 100644
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: aai-logging-service
+ name: aai-logging-service-master
project-name: 'aai-logging-service'
jobs:
- gerrit-maven-clm:
@@ -12,6 +12,20 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'aai-logging-service-settings'
+ files: '**'
+ archive-artifacts: ''
+- project:
+ name: aai-logging-service-releases
+ project-name: 'aai-logging-service'
+ jobs:
+ - gerrit-maven-clm:
+ java-version: ''
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ project: 'aai/logging-service'
+ stream:
- 'release-1.0.0':
branch: 'release-1.0.0'
- 'amsterdam':
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 0b2381d..a75a712 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: aai-model-loader
+ name: aai-model-loader-master
project-name: 'aai-model-loader'
jobs:
- gerrit-maven-clm:
@@ -15,6 +15,24 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'aai-model-loader-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
+- project:
+ name: aai-model-loader-releases
+ project-name: 'aai-model-loader'
+ jobs:
+ - gerrit-maven-clm:
+ java-version: ''
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-aai-docker-java-daily':
+ pom: 'pom.xml'
+ mvn-goals: 'docker:build'
+ project: 'aai/model-loader'
+ stream:
- 'amsterdam':
branch: 'amsterdam'
mvn-settings: 'aai-model-loader-settings'
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 6caccad..5bf70c8 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -19,6 +19,28 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'aai-resources-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
+- project:
+ name: aai-resources-amsterdam
+ project-name: 'aai-resources'
+ jobs:
+ - gerrit-maven-clm:
+ java-version: ''
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-stage-site-java':
+ site-pom: 'pom.xml'
+ trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-aai-docker-java-version-daily':
+ pom: 'aai-resources/pom.xml'
+ mvn-goals: 'docker:build docker:push'
+
+ project: 'aai/resources'
+ stream:
- 'amsterdam':
branch: 'amsterdam'
mvn-settings: 'aai-resources-settings'
diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index c9dcd79..0bd90eb 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: aai-rest-client
+ name: aai-rest-client-master
project-name: 'aai-rest-client'
jobs:
- gerrit-maven-clm:
@@ -12,6 +12,20 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'aai-rest-client-settings'
+ files: '**'
+ archive-artifacts: ''
+- project:
+ name: aai-rest-client-releases
+ project-name: 'aai-rest-client'
+ jobs:
+ - gerrit-maven-clm:
+ java-version: ''
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ project: 'aai/rest-client'
+ stream:
- 'amsterdam':
branch: 'amsterdam'
mvn-settings: 'aai-rest-client-settings'
diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
index d454d8c..4dd1c1f 100644
--- a/jjb/aai/aai-router-core-service.yaml
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: aai-router-core
+ name: aai-router-core-master
project-name: 'aai-router-core'
jobs:
- gerrit-maven-clm:
@@ -12,6 +12,20 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'aai-router-core-settings'
+ files: '**'
+ archive-artifacts: ''
+- project:
+ name: aai-router-core-releases
+ project-name: 'aai-router-core'
+ jobs:
+ - gerrit-maven-clm:
+ java-version: ''
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ project: 'aai/router-core'
+ stream:
- 'amsterdam':
branch: 'amsterdam'
mvn-settings: 'aai-router-core-settings'
diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index e6a67b6..05c4301 100644
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: aai-search-data-service
+ name: aai-search-data-service-master
project-name: 'aai-search-data-service'
jobs:
- gerrit-maven-clm:
@@ -15,6 +15,23 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'aai-search-data-service-settings'
+ files: '**'
+ archive-artifacts: ''
+- project:
+ name: aai-search-data-service-releases
+ project-name: 'aai-search-data-service'
+ jobs:
+ - gerrit-maven-clm:
+ java-version: ''
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-aai-docker-java-daily':
+ pom: 'pom.xml'
+ mvn-goals: 'docker:build'
+ project: 'aai/search-data-service'
+ stream:
- 'amsterdam':
branch: 'amsterdam'
mvn-settings: 'aai-search-data-service-settings'
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 80b1596..8fc52a8 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: aai-sparky-be
+ name: aai-sparky-be-master
project-name: 'aai-sparky-be'
jobs:
- gerrit-maven-clm:
@@ -15,6 +15,23 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'aai-sparky-be-settings'
+ files: '**'
+ archive-artifacts: ''
+- project:
+ name: aai-sparky-be-releases
+ project-name: 'aai-sparky-be'
+ jobs:
+ - gerrit-maven-clm:
+ java-version: ''
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-aai-docker-java-daily':
+ pom: 'pom.xml'
+ mvn-goals: 'docker:build'
+ project: 'aai/sparky-be'
+ stream:
- 'amsterdam':
branch: 'amsterdam'
mvn-settings: 'aai-sparky-be-settings'
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index c8d8ec0..808d741 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: aai-traversal
+ name: aai-traversal-master
project-name: 'aai-traversal'
jobs:
- gerrit-maven-clm:
@@ -19,6 +19,28 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'aai-traversal-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
+- project:
+ name: aai-traversal-amsterdam
+ project-name: 'aai-traversal'
+ jobs:
+ - gerrit-maven-clm:
+ java-version: ''
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-stage-site-java':
+ site-pom: 'pom.xml'
+ trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-aai-docker-java-version-daily':
+ pom: 'aai-traversal/pom.xml'
+ mvn-goals: 'docker:build docker:push'
+
+ project: 'aai/traversal'
+ stream:
- 'amsterdam':
branch: 'amsterdam'
mvn-settings: 'aai-traversal-settings'