X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fnsh_sfc%2Fnsh_sfc.yaml;h=d23efe893db106fca7a9425907d5244092598cf8;hb=29be786d3165364f61fadadf0fba430c2f377018;hp=0dde7e323d68334be12312f6e312659e0631312e;hpb=e33ac91e8adc1ae679bbb13d65eaf2dc3dd4c38d;p=ci-management.git

diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml
index 0dde7e323..d23efe893 100644
--- a/jjb/nsh_sfc/nsh_sfc.yaml
+++ b/jjb/nsh_sfc/nsh_sfc.yaml
@@ -7,13 +7,13 @@
         - 'nsh_sfc-verify-image-{stream}-{os}'
         - 'nsh_sfc-verify-docs-{stream}'
         - 'nsh_sfc-merge-docs-{stream}'
-        - 'csit-nsh_sfc-verify-perf-{stream}'
-        - 'csit-nsh_sfc-verify-func-{stream}-{os}-virl'
 
     project: 'nsh_sfc'
     os:
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
+        - centos7:
+            repo-os-part: 'centos7'
     stream:
         - master:
             branch: 'master'
@@ -27,6 +27,46 @@
         - '1704':
             branch: 'stable/1704'
             repo-stream-part: 'stable.1704'
+        - '1707':
+            branch: 'stable/1707'
+            repo-stream-part: 'stable.1707'
+        - '1710':
+            branch: 'stable/1710'
+            repo-stream-part: 'stable.1710'
+        - '1801':
+            branch: 'stable/1801'
+            repo-stream-part: 'stable.1801'
+        - '1804':
+            branch: 'stable/1804'
+            repo-stream-part: 'stable.1804'
+        - '1807':
+            branch: 'stable/1807'
+            repo-stream-part: 'stable.1807'
+- project:
+    name: nsh_sfc-misc
+    jobs:
+        - 'nsh_sfc-csit-verify-perf-{stream}'
+        - 'nsh_sfc-csit-verify-func-{stream}-{os}-virl'
+
+    project: 'nsh_sfc'
+    stream:
+        - master:
+            branch: 'master'
+            repo-stream-part: 'master'
+        - '1609':
+            branch: 'stable/1609'
+            repo-stream-part: 'stable.1609'
+        - '1701':
+            branch: 'stable/1701'
+            repo-stream-part: 'stable.1609'
+        - '1704':
+            branch: 'stable/1704'
+            repo-stream-part: 'stable.1704'
+        - '1707':
+            branch: 'stable/1707'
+            repo-stream-part: 'stable.1707'
+
+    os: ubuntu1604
 
 - job-template:
     name: 'nsh_sfc-verify-{stream}-{os}'
@@ -36,7 +76,7 @@
     concurrent: true
     jdk: openjdk8-{os}
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -105,7 +145,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -186,7 +226,7 @@
     node: '{os}-basebuild-4c-4g'
     jdk: openjdk8-{os}
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -255,7 +295,7 @@
     node: '{os}-basebuild-4c-4g'
     jdk: openjdk8-{os}
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -303,6 +343,15 @@
                 variable: 'SETTINGS_FILE'
               - file-id: 'global-settings'
                 variable: 'GLOBAL_SETTINGS_FILE'
+        - config-file-provider:
+            files:
+              - file-id: '.packagecloud'
+                target: '/home/jenkins/.packagecloud'
+        - config-file-provider:
+            files:
+              - file-id: 'packagecloud_api'
+                target: '/home/jenkins/packagecloud_api'
+
         - shell:
             !include-raw-escape: ../scripts/create_maven_env.sh
         - inject:
@@ -315,6 +364,9 @@
                 - ../scripts/cleanup_vpp_plugin_dev_env.sh
                 - ../scripts/maven_push_functions.sh
                 - include-raw-nsh_sfc-pkg-push.sh
+        - shell:
+            !include-raw-escape:
+                - ../scripts/packagecloud_push.sh
 
     publishers:
       - fdio-infra-shiplogs:
@@ -328,7 +380,7 @@
     concurrent: true
     jdk: openjdk8-ubuntu1604
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -385,7 +437,7 @@
     concurrent: true
     jdk: openjdk8-{os}
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -456,13 +508,13 @@
             maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-nsh_sfc-verify-perf-{stream}'
+    name: 'nsh_sfc-csit-verify-perf-{stream}'
 
     project-type: freestyle
     node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -473,6 +525,10 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - os-parameter:
+            os: '{os}'
+        - repo-name-parameter:
+            repo-name: '{repo-stream-part}.ubuntu.xenial.main'
 
     scm:
         - gerrit-trigger-scm:
@@ -488,31 +544,31 @@
         - gerrit-trigger-manually-triggered:
             name: '{project}'
             branch: '{branch}'
-            comment-trigger-value: 'nsh_sfc_perf_weekly'
+            comment-trigger-value: 'nsh_sfc_perf'
 
     builders:
         - shell:
-            !include-raw-escape: jjb/nsh_sfc/include-raw-csit-nsh_sfc-perf-hw.sh
+            !include-raw-escape: include-raw-nsh_sfc-csit-perf-hw.sh
 
     publishers:
         - archive-artifacts:
-            artifacts: 'report.html, log.html, output.xml, output_perf_data.xml'
+            artifacts: 'csit/archive/*.*'
             latest-only: false
 
         - robot-report:
-            output-path: ''
+            output-path: 'csit/archive'
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-nsh_sfc-verify-func-{stream}-{os}-virl'
+    name: 'nsh_sfc-csit-verify-func-{stream}-{os}-virl'
 
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -526,7 +582,7 @@
         - os-parameter:
             os: '{os}'
         - repo-name-parameter:
-            repo-name: '{repo-stream-part}.{repo-os-part}'
+            repo-name: '{repo-stream-part}.ubuntu.xenial.main'
 
     scm:
         - gerrit-trigger-scm:
@@ -546,15 +602,15 @@
 
     builders:
         - shell:
-            !include-raw-escape: include-raw-csit-nsh_sfc-functional-virl.sh
+            !include-raw-escape: include-raw-nsh_sfc-csit-functional-virl.sh
 
     publishers:
         - archive-artifacts:
-            artifacts: 'report.html, log.html, output.xml'
+            artifacts: 'csit/archive/*.*'
             latest-only: false
 
         - robot-report:
-            output-path: ''
+            output-path: 'csit/archive'
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'