Chore: Revert back to ubuntu1804-builder

[ci-management.git] / jjb / vfc / vfc-gvnfm-vnfres-java.yaml

diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index 77ec4d9..6551d45 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -7,8 +7,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'amsterdam':
-          branch: 'amsterdam'
     mvn-settings: 'vfc-gvnfm-vnfres-settings'
     subproject:
       - 'res':
@@ -17,12 +15,57 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-gvnfm-vnfres-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-basebuild-4c-4g
\ No newline at end of file
+    build-node: ubuntu1804-builder-4c-4g
+
+- project:
+    name: vfc-gvnfm-vnfres-res-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 res/pom.xml'
+    build-node: ubuntu1804-builder-4c-4g
+    project: 'vfc/gvnfm/vnfres'
+    project-name: 'vfc-gvnfm-vnfres-res'
+    branch: 'master'
+    mvn-settings: 'vfc-gvnfm-vnfres-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vfc-gvnfm-vnfres-java-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: vfc/gvnfm/vnfres
+    project-name: 'vfc-gvnfm-vnfres'
+    build-node: ubuntu1804-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'vfc-gvnfm-vnfres-settings'
+
+- project:
+    name: vfc-gvnfm-vnfres-info
+    project-name: vfc-gvnfm-vnfres
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: vfc/gvnfm/vnfres
+    branch: master