Merge "Add centos7-memcached-4c-4g builder"

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 3ccff7d..cbf92fe 100644 (file)
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -12,8 +12,8 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
-          sign-artifacts: false
-          build-node: ubuntu1604-builder-4c-4g
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
     project: 'aai/aai-common'
     stream:
@@ -68,6 +68,11 @@
     jobs:
       - '{project-name}-{stream}-verify-docker'
       - '{project-name}-{stream}-merge-docker'
+      - gerrit-maven-docker-stage:
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          build-node: ubuntu1604-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
     project-name: 'aai-aai-common'
     project: 'aai/aai-common'
     stream:
@@ -84,3 +89,14 @@
     mvn-version: 'mvn35'
     files: 'Dockerfiles/aai-common/**'
     build-node: ubuntu1604-docker-8c-8g
+
+- project:
+    name: 'aai-aai-common-whitesource'
+    project-name: 'aai-aai-common'
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'aai-aai-common-settings'
+    wss-product-name: 'aai'
+    mvn-clean-install: true
+    project: 'aai/aai-common'
+    branch: master

diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index e4a99a1..5bdc717 100644 (file)
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -63,3 +63,14 @@
       - gerrit-info-yaml-verify
     project: aai/model-loader
     branch: master
+
+- project:
+    name: 'aai-model-loader-whitesource'
+    project-name: 'aai-model-loader'
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'aai-model-loader-settings'
+    wss-product-name: 'aai'
+    mvn-clean-install: true
+    project: 'aai/model-loader'
+    branch: master

diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 011031e..87c6c1f 100644 (file)
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -66,3 +66,14 @@
       - gerrit-info-yaml-verify
     project: aai/resources
     branch: master
+
+- project:
+    name: 'aai-resources-whitesource'
+    project-name: 'aai-resources'
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'aai-resources-settings'
+    wss-product-name: 'aai'
+    mvn-clean-install: true
+    project: 'aai/resources'
+    branch: master

diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index f9dac15..6b0d2d7 100644 (file)
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -81,3 +81,14 @@
       - gerrit-info-yaml-verify
     project: aai/search-data-service
     branch: master
+
+- project:
+    name: 'aai-search-data-service-whitesource'
+    project-name: 'aai-search-data-service'
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'aai-search-data-service-settings'
+    wss-product-name: 'aai'
+    mvn-clean-install: true
+    project: 'aai/search-data-service'
+    branch: master

diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 08b1900..4043bfd 100644 (file)
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -62,3 +62,14 @@
       - gerrit-info-yaml-verify
     project: aai/sparky-be
     branch: master
+
+- project:
+    name: 'aai-sparky-be-whitesource'
+    project-name: 'aai-sparky-be'
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'aai-sparky-be-settings'
+    wss-product-name: 'aai'
+    mvn-clean-install: true
+    project: 'aai/sparky-be'
+    branch: master

diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index 312b36d..d85fbbc 100644 (file)
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -7,8 +7,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: ubuntu1604-builder-4c-4g
           maven-versions-plugin: true
     project: 'aai/sparky-fe'
     stream: