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>

diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index 0cfcee6..fddc4da 100644 (file)
--- 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'
@@ -26,6 +27,23 @@
     files: '**'
     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: