X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fnsh_sfc%2Fnsh_sfc.yaml;h=a62234a71cf06400797867cef6d8411766881ec8;hb=536be0062a160b4595a73ba8d70593b9a0b7eb9e;hp=0a8ccc330b9c5f8b36d40b86c9847d3f7c51e60a;hpb=a2f28b36930b2103e566692cc8689740fc89a08f;p=ci-management.git

diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml
index 0a8ccc330..a62234a71 100644
--- a/jjb/nsh_sfc/nsh_sfc.yaml
+++ b/jjb/nsh_sfc/nsh_sfc.yaml
@@ -69,11 +69,17 @@
 
     os: ubuntu1604
 
+- project:
+    name: nsh-sfc-view
+    views:
+      - project-view
+    project-name: nsh_sfc
+
 - job-template:
     name: 'nsh_sfc-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
     jdk: openjdk8-{os}
 
@@ -143,7 +149,7 @@
     name: 'nsh_sfc-verify-image-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -225,7 +231,7 @@
     name: 'nsh_sfc-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     jdk: openjdk8-{os}
 
     build-discarder:
@@ -294,7 +300,7 @@
     name: 'nsh_sfc-integration-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     jdk: openjdk8-{os}
 
     build-discarder:
@@ -378,7 +384,7 @@
     name: 'nsh_sfc-verify-docs-{stream}'
 
     project-type: freestyle
-    node: ubuntu1604-basebuild-4c-4g
+    node: ubuntu1604-builder-4c-4g
     concurrent: true
     jdk: openjdk8-ubuntu1604
 
@@ -393,8 +399,6 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - os-parameter:
-          os: 'ubuntu1604'
       - maven-exec:
           maven-version: 'mvn33-new'
 
@@ -435,9 +439,14 @@
     name: 'nsh_sfc-merge-docs-{stream}'
 
     project-type: freestyle
-    node: ubuntu1604-basebuild-4c-4g
+    node: '{os}-builder-4c-4g'
     concurrent: true
     jdk: openjdk8-{os}
+    archive-artifacts: '**/build-root/docs/html/*'
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -454,6 +463,10 @@
           os: 'ubuntu1604'
       - maven-exec:
           maven-version: 'mvn33-new'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -501,12 +514,6 @@
           !include-raw-escape: include-raw-nsh_sfc-docs.sh
 
     publishers:
-      - archive:
-          artifacts: 'build-root/docs/html/*'
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
 
@@ -514,8 +521,11 @@
     name: 'nsh_sfc-csit-verify-perf-{stream}'
 
     project-type: freestyle
-    node: 'ubuntu1604-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
+    archive-artifacts: '**/csit/archive/*.*'
+    latest-only: false
+
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -532,6 +542,10 @@
           os: '{os}'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.ubuntu.xenial.main'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -554,10 +568,6 @@
           !include-raw-escape: include-raw-nsh_sfc-csit-perf-hw.sh
 
     pulishers:
-      - archive-artifacts:
-          artifacts: 'csit/archive/*.*'
-          latest-only: false
-
       - robot-report:
           output-path: 'csit/archive'
 
@@ -568,8 +578,11 @@
     name: 'nsh_sfc-csit-verify-func-{stream}-{os}-virl'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
+    archive-artifacts: '**/csit/archive/*.*'
+    latest-only: false
+
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -586,6 +599,10 @@
           os: '{os}'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.ubuntu.xenial.main'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -608,10 +625,6 @@
           !include-raw-escape: include-raw-nsh_sfc-csit-functional-virl.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'csit/archive/*.*'
-          latest-only: false
-
       - robot-report:
           output-path: 'csit/archive'