Chore: Revert back to ubuntu1804-builder

[ci-management.git] / jjb / vnfsdk / vnfsdk-refrepo.yaml

diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 91c8c36..519c447 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -10,7 +10,6 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
           mvn-goals: 'clean package -Pdocker'
@@ -18,45 +17,24 @@
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
-#      - '{project-name}-{stream}-docker-version-java-daily':
-#          docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
-#          mvn-profile: 'docker'
-#          mvn-params: '-Dmaven.test.skip=true'
-#          build-node: ubuntu1804-docker-8c-8g
     project: 'vnfsdk/refrepo'
     stream:
-      - 'master':
-          branch: 'master'
+        - 'master':
+                branch: 'master'
+                java-version: openjdk11
+        - 'frankfurt':
+                branch: 'frankfurt'
+                java-version: openjdk8
     mvn-settings: 'vnfsdk-refrepo-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
 
-#- project:
-#    name: vnfsdk-refrepo-arm64
-#    project-name: 'vnfsdk-refrepo-arm64'
-#    jobs:
-#      - '{project-name}-{stream}-aai-docker-java-daily':
-#          pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml'
-#          mvn-goals: 'docker:build'
-#          docker-image-name: 'onap/vnfsdk/refrepo'
-#      - '{project-name}-{stream}-docker-version-java-daily':
-#          docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
-#          mvn-profile: 'docker'
-#          mvn-params: '-Dmaven.test.skip=true'
-#    project: 'vnfsdk/refrepo'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'vnfsdk-refrepo-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#
 - project:
     name: vnfsdk-refrepo-sonar
     jobs:
       - gerrit-maven-sonar
+    java-version: openjdk11
     sonarcloud: true
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-api-token: '{sonarcloud_api_token}'
@@ -82,11 +60,36 @@
 
 - project:
     name: vnfsdk-refrepo-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: vnfsdk/refrepo
     project-name: 'vnfsdk-refrepo'
     build-node: ubuntu1804-builder-4c-4g
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
+    mvn-settings: 'vnfsdk-refrepo-settings'
+
+- project:
+    name: vnfsdk-refrepo-sonar-verify
+    java-version: openjdk11
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    jobs:
+      - gerrit-maven-sonar-verify
+    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}'
+    build-node: centos7-docker-8c-8g
+    project: 'vnfsdk/refrepo'
+    project-name: 'vnfsdk-refrepo'
     branch: 'master'
     mvn-settings: 'vnfsdk-refrepo-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'