Merge "Add CSIT tests for vnfsdk to JJB."

[ci-management.git] / jjb / sdc / sdc.yaml

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 7efff89..c64d17e 100644 (file)
--- 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,45 +17,58 @@
     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://nexus.onap.org/content/repositories/npm/'
+          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: 'ubuntu1604-docker-8c-8g'
+          build-node: 'ubuntu1804-docker-8c-16g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
-          mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+          mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
       - gerrit-maven-stage:
+          build-timeout: 90
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+          mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+          mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'sdc'
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'sdc-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-8c-8g
-    maven-version: 'mvn35'
+    build-node: ubuntu1804-docker-8c-8g
+    maven-version: 'mvn36'
 
 #- project:
 #    name: sdc-arm64
 #    project-name: 'sdc-arm64'
 #    jobs:
 #      - '{project-name}-{stream}-docker-version-java-daily':
-#          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
 #          docker-pom: 'pom.xml'
 #          mvn-profile: 'docker'
 #          mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
@@ -77,61 +84,60 @@
 - project:
     name: sdc-sonar
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-maven-sonar:
+          build-timeout: 120
+    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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-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://nexus.onap.org/content/repositories/npm/'
+    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://nexus.onap.org/content/repositories/npm/'
+          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: ubuntu1604-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://nexus.onap.org/content/repositories/npm/'
-    nexus-iq-namespace: 'onap-'
-    project: sdc
-    project-name: 'sdc-onboarding'
-    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'sdc'
+    build-node: ubuntu1804-docker-8c-8g
     branch: 'master'
     mvn-settings: 'sdc-settings'
+    java-version: openjdk11
 
 - project:
     name: sdc-info
     project-name: sdc
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc
     branch: master
 
 - project:
     name: 'sdc-whitesource'
     project-name: 'sdc'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
-      - gerrit-whitesource-scan
+      - gerrit-whitesource-scan:
+          build-timeout: 120
+          submodule-timeout: 30
+          java-opts: '-Xmx2048m'
     mvn-settings: 'sdc-settings'
     wss-product-name: 'sdc'
     mvn-clean-install: true
     project: 'sdc'
     branch: master
+    java-version: openjdk11