Chore: Revert back to ubuntu1804-builder

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

diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml
index 74416e8..19c88c3 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-functest.yaml
+++ b/jjb/vnfsdk/vnfsdk-functest.yaml
@@ -5,7 +5,10 @@
     jobs:
     - '{project-name}-{stream}-verify-java'
     - '{project-name}-{stream}-merge-java'
-    - '{project-name}-{stream}-release-version-java-daily'
+    - gerrit-maven-stage:
+        sign-artifacts: true
+        build-node: centos7-builder-4c-4g
+        maven-versions-plugin: true
 
     project: 'vnfsdk/functest'
     stream:
@@ -14,25 +17,13 @@
     mvn-settings: 'vnfsdk-functest-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: vnfsdk-functest-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'vnfsdk/functest'
-    project-name: 'vnfsdk-functest'
-    branch: 'master'
-    mvn-settings: 'vnfsdk-functest-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vnfsdk-functest-info
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'vnfsdk/functest'
     project-name: 'vnfsdk-functest'
     branch: 'master'
@@ -41,8 +32,13 @@
     name: vnfsdk-functest-clm
     jobs:
       - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
     project: vnfsdk/functest
     project-name: 'vnfsdk-functest'
-    build-node: ubuntu1604-builder-4c-4g
-    branch: 'master'
+    build-node: ubuntu1804-builder-4c-4g
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'vnfsdk-functest-settings'