Merge "Modify aaf docker Jenkins template & script"

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 171fdb1..2c4e1fe 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -229,7 +229,7 @@
           server: '{server-name}'
           project: '{project}'
           branch: '{branch}'
-          files: '**'
+          files: '{files}'
 
     builders:
       - provide-maven-settings:
@@ -1032,7 +1032,7 @@
           server: '{server-name}'
           project: '{project}'
           branch: '{branch}'
-          files: '**'
+          files: '{files}'
 
     builders:
       - provide-maven-settings:

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
index 5fbd144..d3ae91f 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
@@ -7,15 +7,11 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
-    mvn-params: '-pl nokia,nokiav2,huawei,zte'
-    subproject:
-      - 'drv-vnfm-root':
-          pom: 'pom.xml'
-          pattern: 'pom.xml'
+    mvn-profile: rootOnly
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-    files: '**'
+      - '{project-name}-{stream}-verify-profile-java'
+      - '{project-name}-{stream}-merge-profile-java'
+      - '{project-name}-{stream}-release-version-profile-java-daily'
+    files: 'pom.xml'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g