Merge "Remove redundant stream"

[ci-management.git] / jjb / aai / aai-aai-common.yaml

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index bff4f47..13a1c5c 100644 (file)
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -12,9 +12,10 @@
       - '{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-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
     project: 'aai/aai-common'
     stream:
       - 'master':
@@ -76,12 +77,9 @@
     project-name: 'aai-aai-common'
     project: 'aai/aai-common'
     stream:
-      - 'master-alpine':
+      - 'master':
           branch: 'master'
           distro: 'alpine'
-      - 'master-ubuntu':
-          branch: 'master'
-          distro: 'ubuntu'
     docker_name: 'onap/aai-common-{distro}'
     docker_build_args: '-f ./Dockerfile.{distro}'
     docker_root: '$WORKSPACE/Dockerfiles/aai-common/'
@@ -89,3 +87,15 @@
     mvn-version: 'mvn35'
     files: 'Dockerfiles/aai-common/**'
     build-node: ubuntu1604-docker-8c-8g
+
+- project:
+    name: 'aai-aai-common-whitesource'
+    project-name: 'aai-aai-common'
+    build-node: ubuntu1604-docker-8c-8g
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'aai-aai-common-settings'
+    wss-product-name: 'aai'
+    mvn-clean-install: true
+    project: 'aai/aai-common'
+    branch: master