Use ubuntu1804-docker-8c-8g for SDC jobs

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

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 76c89d0..19e2957 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -30,30 +30,35 @@
       - '{project-name}-{stream}-verify-java':
           mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
       - '{project-name}-{stream}-sdc-merge-java':
-          build-node: 'ubuntu1604-docker-v1-8c-8g'
+          build-node: 'ubuntu1804-docker-v1-8c-8g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           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://nexus3.onap.org/repository/npm.public/'
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-v1-8c-8g
+          build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
           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'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     maven-version: 'mvn35'
 
 #- project:
@@ -61,7 +66,7 @@
 #    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,9 +82,15 @@
 - 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-8g
     project: 'sdc'
     project-name: 'sdc'
     branch: 'master'
@@ -98,7 +109,7 @@
     nexus-iq-namespace: 'onap-'
     project: sdc
     project-name: 'sdc-catalog'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     branch: 'master'
     mvn-settings: 'sdc-settings'
 
@@ -112,7 +123,7 @@
     nexus-iq-namespace: 'onap-'
     project: sdc
     project-name: 'sdc-onboarding'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     branch: 'master'
     mvn-settings: 'sdc-settings'
 
@@ -128,7 +139,7 @@
 - project:
     name: 'sdc-whitesource'
     project-name: 'sdc'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - gerrit-whitesource-scan:
           build-timeout: 120