Enable log shipping on all nsh_sfc jobs

[ci-management.git] / jjb / nsh_sfc / nsh_sfc.yaml

diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml
index 339f613..5cf4fbb 100644 (file)
--- a/jjb/nsh_sfc/nsh_sfc.yaml
+++ b/jjb/nsh_sfc/nsh_sfc.yaml
@@ -28,7 +28,7 @@
     name: 'nsh_sfc-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: 'verify-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -46,6 +46,8 @@
             os: '{os}'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
+        - maven-exec:
+            maven-version: 'mvn33-new'
 
     scm:
         - gerrit-trigger-scm:
@@ -64,7 +66,7 @@
 
     builders:
         - maven-target:
-            maven-version: 'mvn33'
+            maven-version: 'mvn33-new'
             goals: '--version'
             settings: 'nsh_sfc-settings'
             settings-type: cfp
@@ -87,11 +89,15 @@
                 - include-raw-nsh_sfc-build.sh
                 - ../scripts/cleanup_vpp_plugin_dev_env.sh
 
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
+
 - job-template:
     name: 'nsh_sfc-verify-image-{stream}-{os}'
 
     project-type: freestyle
-    node: 'verify-image-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -109,6 +115,8 @@
             os: '{os}'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
+        - maven-exec:
+            maven-version: 'mvn33-new'
 
     scm:
         - gerrit-trigger-scm:
@@ -140,7 +148,7 @@
 
     builders:
         - maven-target:
-            maven-version: 'mvn33'
+            maven-version: 'mvn33-new'
             goals: '--version'
             settings: 'nsh_sfc-settings'
             settings-type: cfp
@@ -162,12 +170,15 @@
                 - ../scripts/setup_vpp_plugin_dev_env.sh
                 - include-raw-nsh_sfc-build.sh
                 - ../scripts/cleanup_vpp_plugin_dev_env.sh
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'nsh_sfc-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: 'merge-{os}'
+    node: '{os}-basebuild-4c-4g'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -182,6 +193,8 @@
             branch: '{branch}'
         - os-parameter:
             os: '{os}'
+        - maven-exec:
+            maven-version: 'mvn33-new'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
 
@@ -201,6 +214,13 @@
             branch: '{branch}'
 
     builders:
+        - maven-target:
+            maven-version: 'mvn33-new'
+            goals: '--version'
+            settings: 'nsh_sfc-settings'
+            settings-type: cfp
+            global-settings: 'global-settings'
+            global-settings-type: cfp
         - config-file-provider:
             files:
               - file-id: 'nsh_sfc-settings'
@@ -218,11 +238,15 @@
                 - include-raw-nsh_sfc-build.sh
                 - ../scripts/cleanup_vpp_plugin_dev_env.sh
 
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
+
 - job-template:
     name: 'nsh_sfc-integration-{stream}-{os}'
 
     project-type: freestyle
-    node: 'merge-{os}'
+    node: '{os}-basebuild-4c-4g'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -237,6 +261,8 @@
             branch: '{branch}'
         - os-parameter:
             os: '{os}'
+        - maven-exec:
+            maven-version: 'mvn33-new'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
 
@@ -256,6 +282,14 @@
             result: 'success'
 
     builders:
+        - maven-target:
+            maven-version: 'mvn33-new'
+            goals: '--version'
+            settings: 'nsh_sfc-settings'
+            settings-type: cfp
+            global-settings: 'global-settings'
+            global-settings-type: cfp
+
         - config-file-provider:
             files:
               - file-id: 'nsh_sfc-settings'
@@ -275,11 +309,15 @@
                 - ../scripts/maven_push_functions.sh
                 - include-raw-nsh_sfc-pkg-push.sh
 
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
+
 - job-template:
     name: 'nsh_sfc-verify-docs-{stream}'
 
     project-type: freestyle
-    node: 'verify-ubuntu1604'
+    node: ubuntu1604-basebuild-4c-4g
     concurrent: true
 
     logrotate:
@@ -295,6 +333,8 @@
             branch: '{branch}'
         - os-parameter:
             os: 'ubuntu1604'
+        - maven-exec:
+            maven-version: 'mvn33-new'
 
     scm:
         - gerrit-trigger-scm:
@@ -313,7 +353,7 @@
 
     builders:
         - maven-target:
-            maven-version: 'mvn33'
+            maven-version: 'mvn33-new'
             goals: '--version'
             settings: 'vpp-settings'
             settings-type: cfp
@@ -325,14 +365,15 @@
         - shell:
             !include-raw-escape: include-raw-nsh_sfc-docs.sh
 
-
-
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'nsh_sfc-merge-docs-{stream}'
 
     project-type: freestyle
-    node: 'verify-ubuntu1604'
+    node: ubuntu1604-basebuild-4c-4g
     concurrent: true
 
     logrotate:
@@ -348,6 +389,8 @@
             branch: '{branch}'
         - os-parameter:
             os: 'ubuntu1604'
+        - maven-exec:
+            maven-version: 'mvn33-new'
 
     scm:
         - gerrit-trigger-scm:
@@ -382,7 +425,7 @@
 
     builders:
         - maven-target:
-            maven-version: 'mvn33'
+            maven-version: 'mvn33-new'
             goals: '--version'
             settings: 'vpp-settings'
             settings-type: cfp
@@ -393,3 +436,7 @@
             global-settings-file: 'global-settings'
         - shell:
             !include-raw-escape: include-raw-nsh_sfc-docs.sh
+
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'