X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fhc2vpp%2Fhc2vpp-csit.yaml;h=c95d63d5365fbafa8e0cfdefc5ebe4d2ff581241;hb=36107f0f0fed6290985def5ef6e1233b31b7be53;hp=d49ec018099ae7c64deaf934f1f325a23434e2b9;hpb=b6e992b605004f8b8f59d8aca6d1d5d04c433c8a;p=ci-management.git

diff --git a/jjb/hc2vpp/hc2vpp-csit.yaml b/jjb/hc2vpp/hc2vpp-csit.yaml
index d49ec0180..c95d63d53 100644
--- a/jjb/hc2vpp/hc2vpp-csit.yaml
+++ b/jjb/hc2vpp/hc2vpp-csit.yaml
@@ -1,3 +1,4 @@
+---
 - project:
     name: hc2vpp-csit
     description: 'jenkins jobs to test Hc2vpp features.'
@@ -12,23 +13,20 @@
         - master:
             branch: 'master'
             repo-stream-part: 'master'
-        - '1701':
-            branch: 'stable/1701'
-            repo-stream-part: 'stable.1701'
-        - '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'
-    os:
-        - ubuntu1604:
-            repo-os-part: 'ubuntu.xenial.main'
-    odl:
-        - carbon
+        - '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'
+
+    os: 'ubuntu1604'
+    repo-os-part: 'ubuntu.xenial.main'
+
+    odl: 'oxygen'
 
 - project:
     name: csit-hc2vpp-perf
@@ -41,11 +39,11 @@
         - master:
             branch: 'master'
             repo-stream-part: 'master'
-    os:
-        - ubuntu1604:
-            repo-os-part: 'ubuntu.xenial.main'
-    odl:
-        - boron
+
+    os: 'ubuntu1604'
+    repo-os-part: 'ubuntu.xenial.main'
+
+    odl: 'boron'
 
 - job-template:
     name: 'hc2vpp-csit-integration-{stream}-{os}'
@@ -54,7 +52,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}'
@@ -96,6 +94,9 @@
         - robot-report:
             output-path: 'csit/archive'
 
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+
 - job-template:
     name: 'hc2vpp-csit-verify-{stream}-{os}'
 
@@ -104,7 +105,7 @@
     jdk: openjdk8-{os}
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -185,6 +186,9 @@
         - robot-report:
             output-path: 'csit/archive'
 
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+
 - job-template:
     name: 'hc2vpp-csit-integration-odl-{odl}-{stream}-{os}'
 
@@ -192,7 +196,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}'
@@ -236,6 +240,9 @@
         - robot-report:
             output-path: 'csit/archive'
 
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+
 - job-template:
     name: 'hc2vpp-csit-verify-odl-{odl}-{stream}-{os}'
 
@@ -244,7 +251,7 @@
     jdk: openjdk8-{os}
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -295,6 +302,9 @@
                 notbuilt: true
 
     prebuilders:
+        - provide-maven-settings:
+            settings-file: 'honeycomb-settings'
+            global-settings-file: 'global-settings'
         - shell:
             !include-raw-escape: include-raw-hc2vpp-csit-verify-prebuild.sh
 
@@ -322,6 +332,9 @@
         - robot-report:
             output-path: 'csit/archive'
 
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+
 - job-template:
     name: 'hc2vpp-csit-perf-{stream}-{os}'
 
@@ -329,7 +342,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: false
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -356,6 +369,8 @@
             build-timeout: '{build-timeout}'
 
     triggers:
+        - timed: '@weekly'
+
         - gerrit:
             server-name: 'Primary'
             trigger-on:
@@ -395,4 +410,4 @@
         - string:
             name: ODL
             default: '{odl}'
-            description: "ODL version parameter."
\ No newline at end of file
+            description: "ODL version parameter."