summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorLee, Tian (tl5884) <tianl@amdocs.com>2019-03-04 15:52:44 +0000
committerLee, Tian (tl5884) <tianl@amdocs.com>2019-03-04 15:52:44 +0000
commitdded19087859786e2991dd753c405046f694a37f (patch)
tree4c5b2a48aa24297657ffe9037c19a645390c0ccc /jjb
parent951e5155579ce88fae66838dd138380e79924992 (diff)
Add second docker job for aai/search-data-service
search-data-service now builds 2 docker files, one for the microservice, and one for elasticsearch with searchguard plugin. The JJB project has been updated to create an extra docker job to push the new elasticsearch image. Change-Id: I683309b6ad828e6ed9bc80583d49391d0a538771 Issue-ID: AAI-2203 Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/aai/aai-search-data-service.yaml20
1 files changed, 19 insertions, 1 deletions
diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index 0cfcee6cb..fddc4daea 100644
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -13,10 +13,11 @@
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-aai-docker-java-daily':
- pom: 'pom.xml'
+ pom: 'search-data-service-app/pom.xml'
mvn-goals: 'docker:build'
build-node: ubuntu1604-docker-8c-8g
project: 'aai/search-data-service'
+ docker-image-name: 'onap/search-data-service'
stream:
- 'casablanca':
branch: 'casablanca'
@@ -27,6 +28,23 @@
archive-artifacts: ''
- project:
+ name: aai-search-data-service-searchguard
+ project-name: 'aai-search-data-service-searchguard'
+ jobs:
+ - '{project-name}-{stream}-aai-docker-java-daily':
+ pom: 'elasticsearch-sg/pom.xml'
+ mvn-goals: 'docker:build'
+ build-node: ubuntu1604-docker-8c-8g
+ project: 'aai/search-data-service'
+ docker-image-name: 'onap/elasticsearch-sg'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'aai-search-data-service-settings'
+ files: '**'
+ archive-artifacts: ''
+
+- project:
name: aai-search-data-service-sonar
jobs:
- gerrit-maven-sonar