X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fvnfsdk%2Fvnfsdk-ves-agent.yaml;h=34c4e4d3da20473db53bb5febb329ad31bdcde7f;hb=23e63a503745244c6c8d5261b4d43457a43e43cc;hp=d4f2895c0760541210932ff3e8c877381fd48746;hpb=8b79a9475055281c9064b6e27c6d3a09e4003d9e;p=ci-management.git

diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
index d4f2895c0..34c4e4d3d 100644
--- 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,26 +31,13 @@
     mvn-settings: 'vnfsdk-ves-agent-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: vnfsdk-ves-agent-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'vnfsdk/ves-agent'
-    project-name: 'vnfsdk-ves-agent'
-    branch: 'master'
-    mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
-    mvn-settings: 'vnfsdk-ves-agent-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     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 +47,13 @@
     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
-    branch: 'master'
+    build-node: ubuntu1804-builder-4c-4g
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'vnfsdk-ves-agent-settings'