diff options
Diffstat (limited to 'jjb/aai')
| -rw-r--r-- | jjb/aai/aai-aai-common.yaml | 3 | ||||
| -rw-r--r-- | jjb/aai/aai-aai-service.yaml | 4 | ||||
| -rw-r--r-- | jjb/aai/aai-babel.yaml | 3 | ||||
| -rw-r--r-- | jjb/aai/aai-champ.yaml | 3 | ||||
| -rw-r--r-- | jjb/aai/aai-data-router.yaml | 5 | ||||
| -rw-r--r-- | jjb/aai/aai-esr-gui.yaml | 3 | ||||
| -rw-r--r-- | jjb/aai/aai-esr-server.yaml | 3 | ||||
| -rw-r--r-- | jjb/aai/aai-logging-service.yaml | 3 | ||||
| -rw-r--r-- | jjb/aai/aai-model-loader.yaml | 7 | ||||
| -rw-r--r-- | jjb/aai/aai-resources.yaml | 3 | ||||
| -rw-r--r-- | jjb/aai/aai-rest-client.yaml | 3 | ||||
| -rw-r--r-- | jjb/aai/aai-router-core-service.yaml | 3 | ||||
| -rw-r--r-- | jjb/aai/aai-search-data-service.yaml | 5 | ||||
| -rw-r--r-- | jjb/aai/aai-sparky-be.yaml | 5 | ||||
| -rw-r--r-- | jjb/aai/aai-sparky-fe.yaml | 3 | ||||
| -rw-r--r-- | jjb/aai/aai-traversal.yaml | 3 |
16 files changed, 37 insertions, 22 deletions
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index d4417c9da..403ddd00c 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -3,7 +3,8 @@ name: aai-aai-common project-name: 'aai-aai-common' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aai/aai-aai-service.yaml b/jjb/aai/aai-aai-service.yaml index fcaa803d8..48514f623 100644 --- a/jjb/aai/aai-aai-service.yaml +++ b/jjb/aai/aai-aai-service.yaml @@ -3,7 +3,9 @@ name: aai-aai-service project-name: 'aai-aai-service' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' + build-timeout: 45 - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index c128420e0..30162c76a 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -3,7 +3,8 @@ name: aai-babel project-name: 'aai-babel' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-java-daily' diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml index 9a00da2e2..ce859701c 100644 --- a/jjb/aai/aai-champ.yaml +++ b/jjb/aai/aai-champ.yaml @@ -3,7 +3,8 @@ name: aai-champ project-name: 'aai-champ' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index 4109ab413..a3c15ee4a 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -3,10 +3,11 @@ name: aai-data-router project-name: 'aai-data-router' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml index 7e23bc371..e2efa919a 100644 --- a/jjb/aai/aai-esr-gui.yaml +++ b/jjb/aai/aai-esr-gui.yaml @@ -3,7 +3,8 @@ name: aai-esr-gui project-name: 'aai-esr-gui' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily-no-sonar' diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml index 7fe252bd1..2f7076ba4 100644 --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/aai/aai-esr-server.yaml @@ -3,7 +3,8 @@ name: aai-esr-server project-name: 'aai-esr-server' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index c0271e74d..8aa510ac9 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -3,7 +3,8 @@ name: aai-logging-service project-name: 'aai-logging-service' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 85713cf6f..ac761c518 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -3,10 +3,11 @@ name: aai-model-loader project-name: 'aai-model-loader' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' @@ -14,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'aai-model-loader-settings' files: '**' archive-artifacts: '' diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 451e38733..0f466e69e 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -3,7 +3,8 @@ name: aai-resources project-name: 'aai-resources' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index 8d2163f39..51374a20a 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -3,7 +3,8 @@ name: aai-rest-client project-name: 'aai-rest-client' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml index bc855ee72..17323195e 100644 --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@ -3,7 +3,8 @@ name: aai-router-core project-name: 'aai-router-core' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index 6595a561f..de9af76f0 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -3,10 +3,11 @@ name: aai-search-data-service project-name: 'aai-search-data-service' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 421d0f9a4..8f49eb3de 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -3,10 +3,11 @@ name: aai-sparky-be project-name: 'aai-sparky-be' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index cb32f7866..fd1b330e6 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -4,7 +4,8 @@ project-name: 'aai-sparky-fe' build-node: 'centos7-basebuild-4c-4g' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily-no-sonar' diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 32673328b..3803ca3ba 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -3,7 +3,8 @@ name: aai-traversal project-name: 'aai-traversal' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' |