X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fclamp%2Fclamp.yaml;h=fad773d0c2c13aa193d3cc1cbc6d76e6e9dbf91c;hb=bfdc1999cfe12b9e9681500a0f479038d89421c7;hp=b1322f6315a7e5c012df40f5cddeab703cbb5aa2;hpb=8db3837b167d5965b0db6a8eeae980ef1b1d612a;p=ci-management.git

diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index b1322f631..fad773d0c 100644
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -10,58 +10,59 @@
     project-name: 'clamp'
     jobs:
       - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
       - '{project-name}-{stream}-verify-java-checkstyle':
-         mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+          mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+          build-node: ubuntu1804-docker-8c-16g
       - '{project-name}-{stream}-merge-properties-java':
          mvn_properties:
             - docker.pull.registry=nexus3.onap.org:10001
             - docker.push.registry=nexus3.onap.org:10003
-      - '{project-name}-{stream}-release-java-daily-checkstyle':
-         setVersion: 'DoSetVersion'
-         mvn_properties:
-          - docker.pull.registry=nexus3.onap.org:10001
-      - '{project-name}-{stream}-docker-java-properties-daily':
-         setVersion: 'DoSetVersion'
-         docker-pom: 'pom.xml'
-         mvn-profile: 'docker'
-         mvn-params: '-Dmaven.test.skip=true'
-         maven-properties: |
-          clamp.registry=$
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'clamp'
     stream:
         - 'master':
               branch: 'master'
-        - 'dublin':
-              branch: 'dublin'
+        - 'frankfurt':
+              branch: 'frankfurt'
+        - 'guilin':
+              branch: 'guilin'
+        - 'tosca-poc':
+              branch: 'tosca-poc'
     mvn-settings: 'clamp-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: clamp-sonar
     jobs:
       - gerrit-maven-sonar:
           mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+    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-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'clamp'
     project-name: 'clamp'
     branch: 'master'
     mvn-settings: 'clamp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: clamp-clm
@@ -73,13 +74,15 @@
     project-name: 'clamp'
     branch: 'master'
     mvn-settings: 'clamp-settings'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     build-timeout: 120
+    java-version: openjdk11
 
 - project:
     name: clamp-info
     project-name: clamp
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: clamp
     branch: master