X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fccsdk%2Fapps.yaml;h=c62fb3b7d5b0447c201eab0f305e317ceab82233;hb=refs%2Fchanges%2F75%2F95875%2F1;hp=a8644fd83569d5567e15038838ba59b6b107d676;hpb=75620d25ffc42d8dd4448ab8d0f0936b471e3a8f;p=ci-management.git

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index a8644fd83..c62fb3b7d 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -3,9 +3,7 @@
     name: ccsdk-project-view
     project-name: ccsdk
     views:
-      - common-view
-    view-name: ccsdk
-    view-regex: '(?!.*-maven-stage-)(ccsdk-.*)$'
+      - project-view
 
 - project:
     name: ccsdk-apps
@@ -13,15 +11,24 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          build-node: centos7-builder-4c-4g
+          sign-artifacts: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1604-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+          maven-version: "mvn35"
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'ccsdk/apps'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'ccsdk-apps-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -30,6 +37,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+    maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
 
 - project:
@@ -44,6 +52,7 @@
     mvn-settings: 'ccsdk-apps-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    maven-version: "mvn35"
 
 - project:
     name: ccsdk-apps-clm
@@ -55,30 +64,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'ccsdk-apps-settings'
+    maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: ccsdk-apps-docker
-    project-name: 'ccsdk-apps'
-    jobs:
-      - 'docker-version-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-    project: 'ccsdk/apps'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
-    mvn-settings: 'ccsdk-apps-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: docker
-    build-node: queue-docker-4c-4g
-#
 #- project:
 #    name: ccsdk-apps-arm64-docker
 #    project-name: 'ccsdk-apps-arm64'
@@ -103,3 +92,14 @@
       - gerrit-info-yaml-verify
     project: ccsdk/apps
     branch: master
+
+- project:
+    name: ccsdk-apps-whitesource
+    project-name: ccsdk-apps
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-apps-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
+    project: ccsdk/apps
+    branch: master