X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=inline;f=jjb%2Fccsdk%2Fapps.yaml;h=e5b29bab2ec11ea951e1d432c4b021a8cb68e9c1;hb=9b9409368d8417c1e8eb5fbd0cb7db954bc69402;hp=b14d81988c81da49a1316c22a34407d9ea098c44;hpb=008ba02ed146d999053ce69eeda57a617a0d6f75;p=ci-management.git

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index b14d81988..e5b29bab2 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -9,24 +9,29 @@
     name: ccsdk-apps
     project-name: 'ccsdk-apps'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
+          sign-artifacts: true
+          cron: ''
       - 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"
+          cron: '@daily'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
-    sign-artifacts: true
     project: 'ccsdk/apps'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     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
@@ -37,11 +42,18 @@
     archive-artifacts: ''
     maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-apps-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'ccsdk/apps'
@@ -62,32 +74,12 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     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'
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'ccsdk-apps-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: docker
-    maven-version: "mvn35"
-    build-node: queue-docker-4c-4g
-#
 #- project:
 #    name: ccsdk-apps-arm64-docker
 #    project-name: 'ccsdk-apps-arm64'
@@ -103,12 +95,24 @@
 #    archive-artifacts: ''
 #    docker-pom: 'pom.xml'
 #    mvn-profile: docker
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
     name: ccsdk-apps-info
     project-name: ccsdk-apps
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    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