Merge "CSIT-797 Add honeycomb parameter to hc2vpp-csit-verify job"

diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index d46f894..a1225e7 100644 (file)
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -8,7 +8,6 @@
 
     platforms:
         - centos
-        - ubuntu-14.04
         - ubuntu-16.04
 
     templates:

diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml
index 1d10d5a..6243358 100644 (file)
--- a/jjb/cicn/cicn.yaml
+++ b/jjb/cicn/cicn.yaml
@@ -5,8 +5,6 @@
         - 'cicn-longbow-merge-{stream}-{os}'
     project: 'cicn'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
         - centos7:
@@ -26,8 +24,6 @@
         - 'cicn-libparc-merge-{stream}-{os}'
     project: 'cicn'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
         - centos7:
@@ -47,8 +43,6 @@
         - 'cicn-libccnx-common-merge-{stream}-{os}'
     project: 'cicn'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
         - centos7:
@@ -68,8 +62,6 @@
         - 'cicn-libccnx-transport-rta-merge-{stream}-{os}'
     project: 'cicn'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
         - centos7:
@@ -89,8 +81,6 @@
         - 'cicn-libccnx-portal-merge-{stream}-{os}'
     project: 'cicn'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
         - centos7:
@@ -110,8 +100,6 @@
         - 'cicn-libicnet-merge-{stream}-{os}'
     project: 'cicn'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
         - centos7:
@@ -131,8 +119,6 @@
         - 'cicn-metis-merge-{stream}-{os}'
     project: 'cicn'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
         - centos7:
@@ -152,8 +138,6 @@
         - 'cicn-http-server-merge-{stream}-{os}'
     project: 'cicn'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
         - centos7:

diff --git a/jjb/csit/csit-hc2vpp.yaml b/jjb/csit/csit-hc2vpp.yaml
index 7ef5c74..be3a84c 100644 (file)
--- a/jjb/csit/csit-hc2vpp.yaml
+++ b/jjb/csit/csit-hc2vpp.yaml
@@ -2,18 +2,22 @@
     name: csit-hc2vpp
     description: 'jenkins jobs to verify Hc2vpp functional and performance tests.'
     jobs:
-        - 'csit-hc2vpp-verify-func-{os}'
-        - 'csit-hc2vpp-verify-perf'
+        - 'csit-hc2vpp-verify-func-{stream}-{os}'
+        - 'csit-hc2vpp-verify-perf-{stream}'
     project: 'csit'
     branch: 'master'
     build-artifact-num-to-keep: 10
-
     os:
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
+    stream:
+        - master:
+            branch: 'master'
+        - '1710':
+            branch: 'rls1710'
 
 - job-template:
-    name: 'csit-hc2vpp-verify-func-{os}'
+    name: 'csit-hc2vpp-verify-func-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
@@ -31,7 +35,9 @@
         - os-parameter:
             os: '{os}'
         - stream-parameter:
-            stream: 'master'
+            stream: '{stream}'
+        - gerrit-parameter:
+            branch: '{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -72,7 +78,7 @@
             output-path: 'archive'
 
 - job-template:
-    name: 'csit-hc2vpp-verify-perf'
+    name: 'csit-hc2vpp-verify-perf-{stream}'
 
     project-type: freestyle
     node: 'ubuntu1604-basebuild-4c-4g'
@@ -90,7 +96,9 @@
         - os-parameter:
             os: '{os}'
         - stream-parameter:
-            stream: 'master'
+            stream: '{stream}'
+        - gerrit-parameter:
+            branch: '{branch}'
 
     scm:
         - gerrit-trigger-scm:

diff --git a/jjb/deb_dpdk/deb_dpdk.yaml b/jjb/deb_dpdk/deb_dpdk.yaml
index 0821926..9f05f3c 100644 (file)
--- a/jjb/deb_dpdk/deb_dpdk.yaml
+++ b/jjb/deb_dpdk/deb_dpdk.yaml
@@ -7,8 +7,6 @@
 
     project: 'deb_dpdk'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
     stream: