Merge "VVP - Fix link to upload artifact"

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:

diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
index 748dfb0..2a11e97 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -21,7 +21,7 @@
       - '{project-name}-{stream}-merge-java':
         mvn-goals: 'clean deploy'
       - '{project-name}-{stream}-docker-java-shell-daily':
-          mvn-goals: 'clean install dockerfile:build dockerfile:push'
+          mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-latest dockerfile:push@push-version'
           script: '/bin/true'
 
 - project:

diff --git a/jjb/multicloud/build-multicloud-openstack-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-docker-image.sh
index e4f69ff..8d03011 100755 (executable)
--- a/jjb/multicloud/build-multicloud-openstack-docker-image.sh
+++ b/jjb/multicloud/build-multicloud-openstack-docker-image.sh
@@ -9,8 +9,10 @@ chmod 755 ./ocata/docker/*.*
 chmod 755 ./windriver/docker/*.*
 chmod 755 ./pike/docker/*.*
 chmod 755 ./starlingx/docker/*.*
+chmod 755 ./lenovo/docker/*.*
 
 ./ocata/docker/build_image.sh
 ./windriver/docker/build_image.sh
 ./pike/docker/build_image.sh
 ./starlingx/docker/build_image.sh
+./lenovo/docker/build_image.sh

diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index 6ec4a7d..5107d2d 100644 (file)
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -50,6 +50,14 @@
           path: 'fcaps'
           pattern: 'fcaps/**'
           pom: 'fcaps/pom.xml'
+      - 'lenovo':
+          path: 'lenovo'
+          pattern: 'lenovo/**'
+          pom: 'lenovo/pom.xml'
+      - 'lenovo_share':
+          path: 'lenovo'
+          pattern: 'lenovo/**'
+          pom: 'lenovo/pom.xml'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-verify-java'
@@ -163,3 +171,17 @@
     mvn-settings: 'multicloud-openstack-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: multicloud-openstack-lenovo-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'multicloud/openstack'
+    project-name: 'multicloud-openstack-lenovo'
+    branch: 'master'
+    mvn-params: '-f lenovo/pom.xml'
+    mvn-settings: 'multicloud-openstack-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'