X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fsdnc%2Fsdnc-apps.yaml;h=39a89779fad1f9a45fa94cfcc1f0ae3f0414b7da;hb=4447925e2200d4cf8a0556c2b23af0c5e3c270ea;hp=85242bafa099a831b3a55963f6d7dcc39a652911;hpb=8236a6354463f94ce51f7ef7b1f6b87ea37bf712;p=ci-management.git

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 85242bafa..39a89779f 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -9,17 +9,27 @@
     name: sdnc-apps
     project-name: 'sdnc-apps'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          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
 
     project: 'sdnc/apps'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'sdnc-apps-settings'
 
     # due to a strange macro / variable translation problem this needs to be
@@ -29,12 +39,20 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+    maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: sdnc-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: 'sdnc/apps'
@@ -43,25 +61,8 @@
     mvn-settings: 'sdnc-apps-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    maven-version: "mvn35"
 
-- project:
-    name: sdnc-apps-docker
-    project-name: 'sdnc-apps'
-    jobs:
-      - 'docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-    project: 'sdnc/apps'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
-    mvn-settings: 'sdnc-apps-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: queue-docker-4c-4g
 #
 #- project:
 #    name: sdnc-apps-docker-arm64
@@ -91,8 +92,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'sdnc-apps-settings'
 
 - project:
@@ -100,5 +99,6 @@
     project-name: sdnc-apps
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdnc/apps
     branch: master