Merge "Add centos-7 memcached build"

[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 2a6b9a2..cbf92fe 100644 (file)
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -11,7 +11,6 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
@@ -20,8 +19,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
     files: '**'
@@ -51,8 +50,8 @@
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
 
@@ -63,3 +62,41 @@
       - gerrit-info-yaml-verify
     project: aai/aai-common
     branch: master
+
+- project:
+    name: 'aai-aai-common-docker'
+    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:
+      - 'master-alpine':
+          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/'
+    mvn-settings: 'aai-aai-common-settings'
+    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