X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fhc2vpp%2Fhc2vpp-csit.yaml;h=a1f84820e93ff1cf243315056ffde6e9ab4564ed;hb=ce3ab812d043538db20c8a2d7622b3206473d350;hp=6cb2946c5ed9de80ddad5f3bf4aa53f64410634f;hpb=0c8dd51d7f259cbbb559feac78be09b792104396;p=ci-management.git

diff --git a/jjb/hc2vpp/hc2vpp-csit.yaml b/jjb/hc2vpp/hc2vpp-csit.yaml
index 6cb2946c5..a1f84820e 100644
--- a/jjb/hc2vpp/hc2vpp-csit.yaml
+++ b/jjb/hc2vpp/hc2vpp-csit.yaml
@@ -13,9 +13,6 @@
       - master:
           branch: 'master'
           repo-stream-part: 'master'
-      - '1807':
-          branch: 'stable/1807'
-          repo-stream-part: 'stable.1807'
       - '1810':
           branch: 'stable/1810'
           repo-stream-part: 'stable.1810'
@@ -58,8 +55,11 @@
     name: 'hc2vpp-csit-integration-{stream}-{os}'
 
     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}'
@@ -74,6 +74,10 @@
           os: '{os}'
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - git-scm:
@@ -94,9 +98,6 @@
           !include-raw-escape: include-raw-hc2vpp-csit-integration.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'csit/archive/*.*'
-          latest-only: false
       - email-notification:
           email-prefix: '[hc2vpp]'
 
@@ -110,9 +111,11 @@
     name: 'hc2vpp-csit-verify-{stream}-{os}'
 
     project-type: maven
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     jdk: openjdk8-{os}
     concurrent: true
+    archive-artifacts: '**/csit/archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -135,6 +138,10 @@
           stream: '{stream}'
       - odl-parameter:
           odl: '{odl}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -187,9 +194,6 @@
           !include-raw-escape: include-raw-hc2vpp-csit-verify.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'csit/archive/*.*'
-          latest-only: false
       - email-notification:
           email-prefix: '[hc2vpp]'
 
@@ -203,8 +207,11 @@
     name: 'hc2vpp-csit-integration-odl-{odl}-{stream}-{os}'
 
     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}'
@@ -221,6 +228,10 @@
           stream: '{stream}'
       - odl-parameter:
           odl: '{odl}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - git-scm:
@@ -241,9 +252,6 @@
           !include-raw-escape: include-raw-hc2vpp-csit-integration-odl.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'csit/archive/*.*'
-          latest-only: false
       - email-notification:
           email-prefix: '[hc2vpp]'
 
@@ -257,16 +265,17 @@
     name: 'hc2vpp-csit-verify-odl-{odl}-{stream}-{os}'
 
     project-type: maven
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     jdk: openjdk8-{os}
     concurrent: true
+    archive-artifacts: '**/csit/archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
       numToKeep: '{build-num-to-keep}'
       artifactDaysToKeep: '{build-artifact-days-to-keep}'
       artifactNumToKeep: '{build-artifact-num-to-keep}'
-
     parameters:
       - project-parameter:
           project: '{project}'
@@ -282,6 +291,10 @@
           stream: '{stream}'
       - odl-parameter:
           odl: '{odl}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -334,9 +347,6 @@
           !include-raw-escape: include-raw-hc2vpp-csit-verify-odl.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'csit/archive/*.*'
-          latest-only: false
       - email-notification:
           email-prefix: '[hc2vpp]'
 
@@ -350,8 +360,11 @@
     name: 'hc2vpp-csit-perf-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: false
+    archive-artifacts: '**/csit/archive/*.*'
+    latest-only: false
+
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -368,7 +381,10 @@
           stream: '{stream}'
       - odl-parameter:
           odl: '{odl}'
-
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
     scm:
       - gerrit-trigger-scm:
           credentials-id: 'jenkins-gerrit-credentials'
@@ -405,10 +421,6 @@
           !include-raw-escape: include-raw-hc2vpp-csit-perf.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'csit/archive/*.*'
-          latest-only: false
-
       - robot-report:
           output-path: 'csit/archive'