Merge "Change org.apache.maven.wagon version from 2.9 to 3.3.3 in cicn and hicn jobs"

diff --git a/jjb/dmm/dmm.yaml b/jjb/dmm/dmm.yaml
index 8cf673b..274f6a4 100644 (file)
--- a/jjb/dmm/dmm.yaml
+++ b/jjb/dmm/dmm.yaml
@@ -94,8 +94,7 @@
           !include-raw-escape: include-raw-dmm-test-checkstyle.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'dmm-verify-{stream}-{os}'
@@ -138,8 +137,7 @@
           !include-raw-escape: include-raw-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'dmm-merge-{stream}-{os}'
@@ -180,8 +178,7 @@
           !include-raw-escape: include-raw-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'dmm-csit-verify-func-{stream}-{os}-virl'
@@ -230,9 +227,7 @@
     publishers:
       - robot-report:
           output-path: 'csit'
-
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - project:
     name: dmm-info

diff --git a/jjb/puppet-fdio/puppet-fdio.yaml b/jjb/puppet-fdio/puppet-fdio.yaml
index abd54c7..4d705ae 100644 (file)
--- a/jjb/puppet-fdio/puppet-fdio.yaml
+++ b/jjb/puppet-fdio/puppet-fdio.yaml
@@ -118,8 +118,7 @@
           ./scripts/ci-beaker.sh {os}
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - project:
     name: puppet-fdio-info