Migrate to ubuntu1804-builder

[ci-management.git] / jjb / vnfsdk / vnfsdk-ves-agent.yaml

diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
index d4f2895..7d41914 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml
+++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
@@ -11,7 +11,19 @@
           mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-java-daily'
+      - 'gerrit-cmake-verify':
+          build-timeout: 30
+          pre-build: !include-raw-escape: ./vnfsdk-ves-agent-cpp.sh
+          build-dir: $WORKSPACE/veslibrary/ves_cpplibrary/src/build
+          make-opts: -j6
+          build-node: centos7-builder-4c-4g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
+          mvn-pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
+          pattern: 'veslibrary/**'
     project: 'vnfsdk/ves-agent'
     stream:
       - 'master':
@@ -19,14 +31,30 @@
     mvn-settings: 'vnfsdk-ves-agent-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vnfsdk-ves-agent-sonar
     jobs:
       - gerrit-maven-sonar
+      - gerrit-cmake-sonar:
+          build-timeout: 60
+          pre-build: !include-raw-escape: ./vnfsdk-ves-agent-cpp.sh
+          build-dir: $WORKSPACE/veslibrary/ves_cpplibrary/src/build
+          cmake-opts: '-DENABLE_COVERAGE=on -DCOVERAGE_DIR=coverage'
+          sonarcloud-api-token: '{sonarcloud_api_token}'
+          sonarcloud-organization: '{sonarcloud_project_organization}'
+          sonarcloud-project-key: '{sonarcloud_project_organization}_vnfsdk-ves-agent'
+          make-opts: -j6
+          stream: master
+          build-node: centos7-builder-4c-4g
+    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-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vnfsdk/ves-agent'
     project-name: 'vnfsdk-ves-agent'
     branch: 'master'
@@ -39,6 +67,7 @@
     name: vnfsdk-ves-agent-info
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'vnfsdk/ves-agent'
     project-name: 'vnfsdk-ves-agent'
     branch: 'master'
@@ -48,8 +77,9 @@
     jobs:
       - gerrit-maven-clm:
          mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
+    nexus-iq-namespace: 'onap-'
     project: vnfsdk/ves-agent
     project-name: 'vnfsdk-ves-agent'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vnfsdk-ves-agent-settings'