CSIT: Cleanup obsolete 1901 branches

[ci-management.git] / jjb / csit / csit-hc2vpp.yaml

diff --git a/jjb/csit/csit-hc2vpp.yaml b/jjb/csit/csit-hc2vpp.yaml
index 8c858ff..ed788fd 100644 (file)
--- a/jjb/csit/csit-hc2vpp.yaml
+++ b/jjb/csit/csit-hc2vpp.yaml
@@ -4,25 +4,22 @@
     description: 'jenkins jobs verify Hc2vpp functional and performance tests'
     jobs:
       - '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'
+    os:
+      - ubuntu1804:
+          repo-os-part: 'ubuntu.bionic.main'
+      - ubuntu1604:
+          repo-os-part: 'ubuntu.xenial.main'
 
     stream:
-      - master:
-          branch: 'master'
-      - '1801':
-          branch: 'rls1801'
-      - '1804':
-          branch: 'rls1804'
-      - '1807':
-          branch: 'rls1807'
-      - '1810':
-          branch: 'rls1810'
-          branch-id: 'oper-rls1810'
+      - '1904':
+          branch: 'rls1904'
+          branch-id: 'oper-rls1904'
+      - '1908':
+          branch: 'rls1908'
+          branch-id: 'oper-rls1908'
 
 - job-template:
     name: 'csit-hc2vpp-verify-func-{stream}-{os}'
@@ -30,6 +27,8 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
     concurrent: true
+    archive-artifacts: 'archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -46,6 +45,10 @@
           stream: '{stream}'
       - gerrit-parameter:
           branch: '{branch}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -68,67 +71,6 @@
           !include-raw-escape: include-raw-csit-hc2vpp-verify-func.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'archive/*.*'
-          latest-only: false
-
-      - email-notification:
-          email-prefix: '[csit]'
-
-      - robot-report:
-          output-path: 'archive'
-
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-hc2vpp-verify-perf-{stream}'
-
-    project-type: freestyle
-    node: 'ubuntu1604-basebuild-4c-4g'
-    concurrent: 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}'
-      - os-parameter:
-          os: '{os}'
-      - stream-parameter:
-          stream: '{stream}'
-      - gerrit-parameter:
-          branch: '{branch}'
-
-    scm:
-      - gerrit-trigger-scm:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-
-    wrappers:
-      - fdio-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-manually-triggered:
-          comment-trigger-value: 'verify-hc2vpp-perf'
-          name: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - shell:
-          !include-raw-escape: include-raw-csit-hc2vpp-verify-perf.sh
-
-    publishers:
-      - archive-artifacts:
-          artifacts: 'archive/*.*'
-          latest-only: false
-
       - email-notification:
           email-prefix: '[csit]'
 
@@ -136,4 +78,4 @@
           output-path: 'archive'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'