Simplify sonar variables

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

diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml
index d83b42d..1a02b8e 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-functest.yaml
+++ b/jjb/vnfsdk/vnfsdk-functest.yaml
@@ -3,10 +3,12 @@
     name: vnfsdk-functest
     project-name: 'vnfsdk-functest'
     jobs:
-    - gerrit-maven-clm
     - '{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:
@@ -21,6 +23,11 @@
     name: vnfsdk-functest-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: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'vnfsdk/functest'
@@ -37,3 +44,14 @@
     project: 'vnfsdk/functest'
     project-name: 'vnfsdk-functest'
     branch: 'master'
+
+- project:
+    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'
+    mvn-settings: 'vnfsdk-functest-settings'