Merge "Update cloud image list docs"

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 60e3cfd9da0e5137d6161e0c56528d5d6f61beed..e66dc54b666d246aed896307430c97457daf16f5 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -86,10 +86,6 @@
           settings-type: cfp
           global-settings: '{global-settings}'
           global-settings-type: cfp
-
-- builder:
-    name: autorelease-maven-sources-post-process
-    builders:
       - shell: |
           awk '/The following files have NOT been resolved:/,/^$/' sources.log > missing-sources.log
 

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 4a320b8ca5b5c70a1c505014ef563624eaea2514..50a23191e5080fa7f000a29415e6238eb7447310 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -79,7 +79,7 @@
 
     parameters:
       - maven-exec:
-          maven-version: 'mvn35'
+          maven-version: '{mvn-version}'
       - lf-infra-parameters:
           project: '{project}'
           stream: '{stream}'
@@ -148,7 +148,7 @@
       # to enable building in a single maven reactor afterwards.
       - autorelease-fix-relative-paths
       - maven-target:
-          maven-version: 'mvn35'
+          maven-version: '{mvn-version}'
           pom: 'pom.xml'
           goals: |
               clean deploy
@@ -167,10 +167,9 @@
       - autorelease-get-integration-test-variables
       - autorelease-maven-sources:
           opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}'
-          maven-version: 'mvn35'
+          maven-version: '{mvn-version}'
           settings: 'autorelease-settings'
           global-settings: 'global-settings'
-      - autorelease-maven-sources-post-process
       - shell: |
           mkdir -p archives/
           cp *.log *.prop $_

diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index 920b4e294b4fcdac55c46534984a2b8755a26a20..e5062234f045e46701ac5109615634203b5bb904 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -13,6 +13,8 @@
     project-name: 'transportpce'
     stream: neon
     branch: 'master'
+    build-node: centos7-builder-8c-8g
+    build-timeout: 90
     mvn-settings: 'transportpce-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -35,6 +37,8 @@
     project-name: 'transportpce'
     stream: fluorine
     branch: 'stable/fluorine'
+    build-node: centos7-builder-8c-8g
+    build-timeout: 90
     mvn-settings: 'transportpce-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -52,6 +56,8 @@
     project-name: 'transportpce'
     stream: oxygen
     branch: 'stable/oxygen'
+    build-node: centos7-builder-8c-8g
+    build-timeout: 90
     mvn-settings: 'transportpce-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'