Chore: Revert back to ubuntu1804-builder

[ci-management.git] / jjb / vfc / vfc-nfvo-driver-vnfm-gvnfm-java.yaml

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index 12ffa5d..db89aff 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -13,29 +13,61 @@
           pom: 'gvnfmadapter/pom.xml'
           pattern: 'gvnfmadapter/**'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'gvnfmadapter/pom.xml'
+          mvn-params: '-f gvnfmadapter/pom.xml'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-gvnfm-driver-docker-image.sh'
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter-sonar
     jobs:
       - gerrit-maven-sonar
+    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.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f gvnfmadapter/pom.xml'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/nfvo/driver/vnfm/gvnfm'
     project-name: 'vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter'
     branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vfc-nfvo-driver-vnfm-gvnfm-java-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: vfc/nfvo/driver/vnfm/gvnfm
+    project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
+    build-node: ubuntu1804-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
+
+- project:
+    name: vfc-nfvo-driver-vnfm-gvnfm-info
+    project-name: vfc-nfvo-driver-vnfm-gvnfm
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: vfc/nfvo/driver/vnfm/gvnfm
+    branch: master