X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit-hc2vpp.yaml;h=d491220154ba23cb4a73ef2d6dc702cc2c5880f4;hb=d30c4ade95d46c226c81e3ea2e06394ffd90da75;hp=302109ee98cfa7276f045414f9f40d1022fbfa3b;hpb=b0e99c668e4b13953595135e5a5f3a6e64d3be7e;p=ci-management.git

diff --git a/jjb/csit/csit-hc2vpp.yaml b/jjb/csit/csit-hc2vpp.yaml
index 302109ee9..d49122015 100644
--- a/jjb/csit/csit-hc2vpp.yaml
+++ b/jjb/csit/csit-hc2vpp.yaml
@@ -1,26 +1,38 @@
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+---
 - project:
     name: csit-hc2vpp
-    description: 'jenkins jobs to verify Hc2vpp functional and performance tests.'
+    description: 'jenkins jobs verify Hc2vpp functional and performance tests'
     jobs:
-        - 'csit-hc2vpp-verify-func-{stream}-{os}'
-        - 'csit-hc2vpp-verify-perf-{stream}'
+      - 'csit-hc2vpp-verify-func-{stream}-{os}'
     project: 'csit'
     branch: 'master'
     build-artifact-num-to-keep: 10
     os:
-        - ubuntu1604:
-            repo-os-part: 'ubuntu.xenial.main'
+      - ubuntu1804:
+          repo-os-part: 'ubuntu.bionic.main'
+      - ubuntu1604:
+          repo-os-part: 'ubuntu.xenial.main'
+
     stream:
-        - master:
-            branch: 'master'
-        - '1710':
-            branch: 'rls1710'
-        - '1801':
-            branch: 'rls1801'
-        - '1804':
-            branch: 'rls1804'
-        - '1807':
-            branch: 'rls1807'
+      - '1904':
+          branch: 'rls1904'
+          branch-id: 'oper-rls1904'
+      - '1908':
+          branch: 'rls1908'
+          branch-id: 'oper-rls1908'
 
 - job-template:
     name: 'csit-hc2vpp-verify-func-{stream}-{os}'
@@ -28,110 +40,56 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
     concurrent: true
+    archive-artifacts: 'archive/*.*'
+    latest-only: false
 
-    logrotate:
-        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-func'
-            name: '{project}'
-            branch: '{branch}'
-
-    builders:
-        - shell:
-            !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
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    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}'
+      - project-parameter:
+          project: '{project}'
+      - os-parameter:
+          os: '{os}'
+      - stream-parameter:
+          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:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - fdio-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-manually-triggered:
-            comment-trigger-value: 'verify-hc2vpp-perf'
-            name: '{project}'
-            branch: '{branch}'
+      - gerrit-trigger-manually-triggered:
+          comment-trigger-value: 'verify-hc2vpp-func'
+          name: '{project}'
+          branch: '{branch}'
 
     builders:
-        - shell:
-            !include-raw-escape: include-raw-csit-hc2vpp-verify-perf.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/csit/hc2vpp-verify-func.sh
 
     publishers:
-        - archive-artifacts:
-            artifacts: 'archive/*.*'
-            latest-only: false
-
-        - email-notification:
-            email-prefix: '[csit]'
+      - email-notification:
+          email-prefix: '[csit]'
 
-        - robot-report:
-            output-path: 'archive'
+      - robot-report:
+          output-path: 'archive'
 
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn36'