Update maven3.5 to 3.6. Part of JDK11 migration

[ci-management.git] / jjb / ccsdk / cds.yaml

diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index ea3d291..4afe8ef 100644 (file)
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -3,19 +3,22 @@
     name: ccsdk-cds
     project-name: 'ccsdk-cds'
     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
           maven-versions-plugin: true
+          cron: ''
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-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"
+          maven-version: "mvn36"
           maven-versions-plugin: true
+          cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
@@ -25,6 +28,8 @@
           branch: 'master'
       - 'elalto':
           branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'ccsdk-cds-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
@@ -33,8 +38,11 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    maven-version: "mvn36"
+    java-version: openjdk11
+    build-node: ubuntu1804-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-cds-sonar
@@ -44,16 +52,17 @@
     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.6.0.1398:sonar"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'ccsdk/cds'
     project-name: 'ccsdk-cds'
     branch: 'master'
     mvn-settings: 'ccsdk-cds-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn35"
+    maven-version: "mvn36"
+    java-version: openjdk11
 
 - project:
     name: ccsdk-cds-clm
@@ -65,9 +74,12 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'ccsdk-cds-settings'
-    maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    maven-version: "mvn36"
+    java-version: openjdk11
+    build-node: ubuntu1804-builder-4c-4g
 
 
 - project:
@@ -75,6 +87,7 @@
     project-name: ccsdk-cds
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: ccsdk/cds
     branch: master
 
@@ -88,3 +101,5 @@
     mvn-clean-install: true
     project: ccsdk/cds
     branch: master
+    maven-version: "mvn36"
+    java-version: openjdk11