X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fsdc%2Fsdc.yaml;h=c6a9eccdef9f2f42bec2509720a87736724a2e06;hb=0f76b014b56ed9947d2ff27821c5bfb422dd9148;hp=862447a95d59c94cad62c73755f64ea43d3858bd;hpb=b69272702c17e8217b5d63ea570d20ccf57dd38a;p=ci-management.git

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 862447a95..c6a9eccde 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -1,10 +1,4 @@
 ---
-- project:
-    name: sdc-master-project-view
-    project-name: sdc-master
-    views:
-      - project-view
-
 - project:
     name: sdc-sdc-docker-project-view
     project-name: sdc-sdc-docker
@@ -23,14 +17,21 @@
     views:
       - project-view
 
+- project:
+    name: sdc-project-view
+    project-name: sdc
+    views:
+      - project-view
+
 - project:
     name: sdc
     project-name: 'sdc'
     jobs:
       - '{project-name}-{stream}-verify-java':
-          mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+          mvn-params: '-P docker -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+          build-node: 'ubuntu1804-docker-8c-16g'
       - '{project-name}-{stream}-sdc-merge-java':
-          build-node: 'ubuntu1804-docker-v1-8c-8g'
+          build-node: 'ubuntu1804-docker-8c-16g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
@@ -39,7 +40,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+          mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
@@ -53,10 +54,13 @@
     stream:
       - 'master':
           branch: 'master'
+          java-version: openjdk11
+      - 'guilin':
+          branch: 'guilin'
+          java-version: openjdk11
       - 'frankfurt':
           branch: 'frankfurt'
-      - 'elalto':
-          branch: 'elalto'
+          java-version: openjdk8
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''
@@ -92,42 +96,30 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar"
     cron: '@daily'
-    build-node: ubuntu1804-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-16g
     project: 'sdc'
     project-name: 'sdc'
     branch: 'master'
     mvn-settings: 'sdc-settings'
-    mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+    java-version: openjdk11
+    mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
 
 - project:
-    name: sdc-clm-catalog
+    name: sdc-clm
     jobs:
       - gerrit-maven-clm:
           build-timeout: 120
           submodule-timeout: 30
-          mvn-params: '-P catalog -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+          mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
     nexus-iq-namespace: 'onap-'
     project: sdc
-    project-name: 'sdc-catalog'
-    build-node: ubuntu1804-docker-8c-8g
-    branch: 'master'
-    mvn-settings: 'sdc-settings'
-
-- project:
-    name: sdc-clm-onboarding
-    jobs:
-      - gerrit-maven-clm:
-          build-timeout: 120
-          submodule-timeout: 30
-          mvn-params: '-P onboarding -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
-    nexus-iq-namespace: 'onap-'
-    project: sdc
-    project-name: 'sdc-onboarding'
+    project-name: 'sdc'
     build-node: ubuntu1804-docker-8c-8g
     branch: 'master'
     mvn-settings: 'sdc-settings'
+    java-version: openjdk11
 
 - project:
     name: sdc-info
@@ -152,3 +144,4 @@
     mvn-clean-install: true
     project: 'sdc'
     branch: master
+    java-version: openjdk11